Commit 992be5d3 authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

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: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 776b6c8a

drivers/firmware/arm_scmi/power.c

+3 −2
Original line number Diff line number Diff line
@@ -174,7 +174,8 @@ 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,

static const char *

scmi_power_name_get(const struct scmi_protocol_handle *ph,

		    u32 domain)

{

	struct scmi_power_info *pi = ph->get_priv(ph);

drivers/firmware/arm_scmi/reset.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

include/linux/scmi_protocol.h

+4 −2
Original line number Diff line number Diff line
@@ -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);