History

firmware: arm_scmi: Make name_get operations return a const

A few protocol operations are available that returns a pointer to an internal character array representing resource name. Make those functions return a const pointer to such array.

Cristian Marussi committed 4 years ago

Commit 992be5d1 parent 776b6c83 files · +9 −6Browse files

Unified · Split

3 files
  1. drivers/firmware/arm_scmi/power.c +3 −2
  2. drivers/firmware/arm_scmi/reset.c +2 −2
  3. include/linux/scmi_protocol.h +4 −2
drivers/firmware/arm_scmi/power.c+3−2
@@ -174,8 +174,9 @@ static int scmi_power_num_domains_get(const struct scmi_protocol_handle *ph) · 173 unmodified lines
174 return pi->num_domains;174 return pi->num_domains;
175}175}
176 176
177static char *scmi_power_name_get(const struct scmi_protocol_handle *ph,177static const char *
178 u32 domain)178scmi_power_name_get(const struct scmi_protocol_handle *ph,
179 u32 domain)
179{180{
180 struct scmi_power_info *pi = ph->get_priv(ph);181 struct scmi_power_info *pi = ph->get_priv(ph);
181 struct power_dom_info *dom = pi->dom_info + domain;182 struct power_dom_info *dom = pi->dom_info + domain;
drivers/firmware/arm_scmi/reset.c+2−2
@@ -126,8 +126,8 @@ static int scmi_reset_num_domains_get(const struct scmi_protocol_handle *ph) · 125 unmodified lines
126 return pi->num_domains;126 return pi->num_domains;
127}127}
128 128
129static char *scmi_reset_name_get(const struct scmi_protocol_handle *ph,129static const char *
130 u32 domain)130scmi_reset_name_get(const struct scmi_protocol_handle *ph, u32 domain)
131{131{
132 struct scmi_reset_info *pi = ph->get_priv(ph);132 struct scmi_reset_info *pi = ph->get_priv(ph);
133 133
include/linux/scmi_protocol.h+4−2
@@ -146,7 +146,8 @@ struct scmi_perf_proto_ops { · 145 unmodified lines
146 */146 */
147struct scmi_power_proto_ops {147struct scmi_power_proto_ops {
148 int (*num_domains_get)(const struct scmi_protocol_handle *ph);148 int (*num_domains_get)(const struct scmi_protocol_handle *ph);
149 char *(*name_get)(const struct scmi_protocol_handle *ph, u32 domain);149 const char *(*name_get)(const struct scmi_protocol_handle *ph,
150 u32 domain);
150#define SCMI_POWER_STATE_TYPE_SHIFT 30151#define SCMI_POWER_STATE_TYPE_SHIFT 30
151#define SCMI_POWER_STATE_ID_MASK (BIT(28) - 1)152#define SCMI_POWER_STATE_ID_MASK (BIT(28) - 1)
152#define SCMI_POWER_STATE_PARAM(type, id) \153#define SCMI_POWER_STATE_PARAM(type, id) \
@@ -484,7 +485,8 @@ struct scmi_sensor_proto_ops { · 331 unmodified lines
484 */485 */
485struct scmi_reset_proto_ops {486struct scmi_reset_proto_ops {
486 int (*num_domains_get)(const struct scmi_protocol_handle *ph);487 int (*num_domains_get)(const struct scmi_protocol_handle *ph);
487 char *(*name_get)(const struct scmi_protocol_handle *ph, u32 domain);488 const char *(*name_get)(const struct scmi_protocol_handle *ph,
489 u32 domain);
488 int (*latency_get)(const struct scmi_protocol_handle *ph, u32 domain);490 int (*latency_get)(const struct scmi_protocol_handle *ph, u32 domain);
489 int (*reset)(const struct scmi_protocol_handle *ph, u32 domain);491 int (*reset)(const struct scmi_protocol_handle *ph, u32 domain);
490 int (*assert)(const struct scmi_protocol_handle *ph, u32 domain);492 int (*assert)(const struct scmi_protocol_handle *ph, u32 domain);