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.

Link: https://lore.kernel.org/r/20220330150551.2573938-7-cristian.marussi@arm.com
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c
index 0f0b94f0b624aacdde83c33891c1c1a7f914c4c4..5c04d63e7ff1ab7f258aad48f16df6ae1d54a70b 100644 (file)
--- a/drivers/firmware/arm_scmi/power.c
+++ b/drivers/firmware/arm_scmi/power.c
@@ -174,8 +174,9 @@ static int scmi_power_num_domains_get(const struct scmi_protocol_handle *ph)
        return pi->num_domains;
 }
 
-static char *scmi_power_name_get(const struct scmi_protocol_handle *ph,
-                                u32 domain)
+static const char *
+scmi_power_name_get(const struct scmi_protocol_handle *ph,
+                   u32 domain)
 {
        struct scmi_power_info *pi = ph->get_priv(ph);
        struct power_dom_info *dom = pi->dom_info + domain;

diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c
index 9cdbd133db10e12261d31a2d6c9b0f7e39408035..b823a9f64af983f50611ca37f8f291daa832812c 100644 (file)
--- a/drivers/firmware/arm_scmi/reset.c
+++ b/drivers/firmware/arm_scmi/reset.c
@@ -126,8 +126,8 @@ static int scmi_reset_num_domains_get(const struct scmi_protocol_handle *ph)
        return pi->num_domains;
 }
 
-static char *scmi_reset_name_get(const struct scmi_protocol_handle *ph,
-                                u32 domain)
+static const char *
+scmi_reset_name_get(const struct scmi_protocol_handle *ph, u32 domain)
 {
        struct scmi_reset_info *pi = ph->get_priv(ph);
 

diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index b87551f41f9f0732df70fa347cc4540b3e416b8c..ced37d1de1feaaa7667ee69fc129e9f014f53416 100644 (file)
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -146,7 +146,8 @@ struct scmi_perf_proto_ops {
  */
 struct scmi_power_proto_ops {
        int (*num_domains_get)(const struct scmi_protocol_handle *ph);
-       char *(*name_get)(const struct scmi_protocol_handle *ph, u32 domain);
+       const char *(*name_get)(const struct scmi_protocol_handle *ph,
+                               u32 domain);
 #define SCMI_POWER_STATE_TYPE_SHIFT    30
 #define SCMI_POWER_STATE_ID_MASK       (BIT(28) - 1)
 #define SCMI_POWER_STATE_PARAM(type, id) \
@@ -484,7 +485,8 @@ struct scmi_sensor_proto_ops {
  */
 struct scmi_reset_proto_ops {
        int (*num_domains_get)(const struct scmi_protocol_handle *ph);
-       char *(*name_get)(const struct scmi_protocol_handle *ph, u32 domain);
+       const char *(*name_get)(const struct scmi_protocol_handle *ph,
+                               u32 domain);
        int (*latency_get)(const struct scmi_protocol_handle *ph, u32 domain);
        int (*reset)(const struct scmi_protocol_handle *ph, u32 domain);
        int (*assert)(const struct scmi_protocol_handle *ph, u32 domain);