Commit 3cb8c95f authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

firmware: arm_scmi: Cleanup events registration transient code 

Remove all the events registration code used to ease the transition to the
new interface based on protocol handles.

Link: https://lore.kernel.org/r/20210316124903.35011-35-cristian.marussi@arm.com


Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 9162afa2

drivers/firmware/arm_scmi/base.c

+2 −2
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int scmi_base_error_notify(const struct scmi_protocol_handle *ph, 
	return ret;

}



static int scmi_base_set_notify_enabled(const void *ph,

static int scmi_base_set_notify_enabled(const struct scmi_protocol_handle *ph,

					u8 evt_id, u32 src_id, bool enable)

{

	int ret;
@@ -276,7 +276,7 @@ static int scmi_base_set_notify_enabled(const void *ph, 
	return ret;

}



static void *scmi_base_fill_custom_report(const void *ph,

static void *scmi_base_fill_custom_report(const struct scmi_protocol_handle *ph,

					  u8 evt_id, ktime_t timestamp,

					  const void *payld, size_t payld_sz,

					  void *report, u32 *src_id)

drivers/firmware/arm_scmi/notify.h

+3 −3
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ struct scmi_protocol_handle; 
 *	    process context.

 */

struct scmi_event_ops {

	int (*get_num_sources)(const void *handle);

	int (*set_notify_enabled)(const void *handle,

	int (*get_num_sources)(const struct scmi_protocol_handle *ph);

	int (*set_notify_enabled)(const struct scmi_protocol_handle *ph,

				  u8 evt_id, u32 src_id, bool enabled);

	void *(*fill_custom_report)(const void *handle,

	void *(*fill_custom_report)(const struct scmi_protocol_handle *ph,

				    u8 evt_id, ktime_t timestamp,

				    const void *payld, size_t payld_sz,

				    void *report, u32 *src_id);

drivers/firmware/arm_scmi/perf.c

+4 −5
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static const struct scmi_perf_proto_ops perf_proto_ops = { 
	.power_scale_mw_get = scmi_power_scale_mw_get,

};



static int scmi_perf_set_notify_enabled(const void *ph,

static int scmi_perf_set_notify_enabled(const struct scmi_protocol_handle *ph,

					u8 evt_id, u32 src_id, bool enable)

{

	int ret, cmd_id;
@@ -786,7 +786,7 @@ static int scmi_perf_set_notify_enabled(const void *ph, 
	return ret;

}



static void *scmi_perf_fill_custom_report(const void *ph,

static void *scmi_perf_fill_custom_report(const struct scmi_protocol_handle *ph,

					  u8 evt_id, ktime_t timestamp,

					  const void *payld, size_t payld_sz,

					  void *report, u32 *src_id)
@@ -834,10 +834,9 @@ static void *scmi_perf_fill_custom_report(const void *ph, 
	return rep;

}



static int scmi_perf_get_num_sources(const void *ph)

static int scmi_perf_get_num_sources(const struct scmi_protocol_handle *ph)

{

	struct scmi_perf_info *pi =

		((const struct scmi_protocol_handle *)ph)->get_priv(ph);

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



	if (!pi)

		return -EINVAL;

drivers/firmware/arm_scmi/power.c

+8 −8
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static int scmi_power_request_notify(const struct scmi_protocol_handle *ph, 
	return ret;

}



static int scmi_power_set_notify_enabled(const void *ph,

static int scmi_power_set_notify_enabled(const struct scmi_protocol_handle *ph,

					 u8 evt_id, u32 src_id, bool enable)

{

	int ret;
@@ -224,7 +224,8 @@ static int scmi_power_set_notify_enabled(const void *ph, 
	return ret;

}



static void *scmi_power_fill_custom_report(const void *ph,

static void *

scmi_power_fill_custom_report(const struct scmi_protocol_handle *ph,

			      u8 evt_id, ktime_t timestamp,

			      const void *payld, size_t payld_sz,

			      void *report, u32 *src_id)
@@ -244,10 +245,9 @@ static void *scmi_power_fill_custom_report(const void *ph, 
	return r;

}



static int scmi_power_get_num_sources(const void *ph)

static int scmi_power_get_num_sources(const struct scmi_protocol_handle *ph)

{

	struct scmi_power_info *pinfo =

		((const struct scmi_protocol_handle *)ph)->get_priv(ph);

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



	if (!pinfo)

		return -EINVAL;

drivers/firmware/arm_scmi/reset.c

+8 −8
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static int scmi_reset_notify(const struct scmi_protocol_handle *ph, 
	return ret;

}



static int scmi_reset_set_notify_enabled(const void *ph,

static int scmi_reset_set_notify_enabled(const struct scmi_protocol_handle *ph,

					 u8 evt_id, u32 src_id, bool enable)

{

	int ret;
@@ -238,7 +238,8 @@ static int scmi_reset_set_notify_enabled(const void *ph, 
	return ret;

}



static void *scmi_reset_fill_custom_report(const void *ph,

static void *

scmi_reset_fill_custom_report(const struct scmi_protocol_handle *ph,

			      u8 evt_id, ktime_t timestamp,

			      const void *payld, size_t payld_sz,

			      void *report, u32 *src_id)
@@ -258,10 +259,9 @@ static void *scmi_reset_fill_custom_report(const void *ph, 
	return r;

}



static int scmi_reset_get_num_sources(const void *ph)

static int scmi_reset_get_num_sources(const struct scmi_protocol_handle *ph)

{

	struct scmi_reset_info *pinfo =

		((const struct scmi_protocol_handle *)ph)->get_priv(ph);

	struct scmi_reset_info *pinfo = ph->get_priv(ph);



	if (!pinfo)

		return -EINVAL;