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: Florian Fainelli <f.fainelli@gmail.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/base.c b/drivers/firmware/arm_scmi/base.c
index b5b6bd08132e62b2054a92f2a9cc4d639b340779..0d28f0f825b6fb1a384b56c3fbe909f5ac7ac68d 100644 (file)
--- a/drivers/firmware/arm_scmi/base.c
+++ b/drivers/firmware/arm_scmi/base.c
@@ -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)

diff --git a/drivers/firmware/arm_scmi/notify.h b/drivers/firmware/arm_scmi/notify.h
index 97c0e3dd973b43ff40deb2c691c234a501d8e53c..ce0324be6c71df9580a8e299d3214b5ea2cf6dc9 100644 (file)
--- a/drivers/firmware/arm_scmi/notify.h
+++ b/drivers/firmware/arm_scmi/notify.h
@@ -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);

diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c
index 9770821c4819102f6f8fc568cda990c4c44c4673..059d6214f93b8c769d32811265bee08e0a608f01 100644 (file)
--- a/drivers/firmware/arm_scmi/perf.c
+++ b/drivers/firmware/arm_scmi/perf.c
@@ -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;

diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c
index ecdf49abd981391fb3b3672cb6228f50848a6d83..e0987f0a8fb276ecbc9f925b9b7fd6320e4cc725 100644 (file)
--- a/drivers/firmware/arm_scmi/power.c
+++ b/drivers/firmware/arm_scmi/power.c
@@ -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,10 +224,11 @@ static int scmi_power_set_notify_enabled(const void *ph,
        return ret;
 }
 
-static void *scmi_power_fill_custom_report(const void *ph,
-                                          u8 evt_id, ktime_t timestamp,
-                                          const void *payld, size_t payld_sz,
-                                          void *report, u32 *src_id)
+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)
 {
        const struct scmi_power_state_notify_payld *p = payld;
        struct scmi_power_state_changed_report *r = report;
@@ -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;

diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c
index 7ea1286bfed661f116a67310247c6bfaf972077c..48b487302db8372fb373bda5dfcfc87a86b70900 100644 (file)
--- a/drivers/firmware/arm_scmi/reset.c
+++ b/drivers/firmware/arm_scmi/reset.c
@@ -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,10 +238,11 @@ static int scmi_reset_set_notify_enabled(const void *ph,
        return ret;
 }
 
-static void *scmi_reset_fill_custom_report(const void *ph,
-                                          u8 evt_id, ktime_t timestamp,
-                                          const void *payld, size_t payld_sz,
-                                          void *report, u32 *src_id)
+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)
 {
        const struct scmi_reset_issued_notify_payld *p = payld;
        struct scmi_reset_issued_report *r = report;
@@ -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;

diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c
index 2f5b06135468884784a331ddd3579b59dcf43864..935c4b08829dab914bdb841c3d3e0d5aa60f05ba 100644 (file)
--- a/drivers/firmware/arm_scmi/sensors.c
+++ b/drivers/firmware/arm_scmi/sensors.c
@@ -834,7 +834,7 @@ static const struct scmi_sensor_proto_ops sensor_proto_ops = {
        .config_set = scmi_sensor_config_set,
 };
 
-static int scmi_sensor_set_notify_enabled(const void *ph,
+static int scmi_sensor_set_notify_enabled(const struct scmi_protocol_handle *ph,
                                          u8 evt_id, u32 src_id, bool enable)
 {
        int ret;
@@ -858,10 +858,11 @@ static int scmi_sensor_set_notify_enabled(const void *ph,
        return ret;
 }
 
-static void *scmi_sensor_fill_custom_report(const void *ph,
-                                           u8 evt_id, ktime_t timestamp,
-                                           const void *payld, size_t payld_sz,
-                                           void *report, u32 *src_id)
+static void *
+scmi_sensor_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)
 {
        void *rep = NULL;
 
@@ -888,8 +889,7 @@ static void *scmi_sensor_fill_custom_report(const void *ph,
                struct scmi_sensor_info *s;
                const struct scmi_sensor_update_notify_payld *p = payld;
                struct scmi_sensor_update_report *r = report;
-               struct sensors_info *sinfo =
-                       ((const struct scmi_protocol_handle *)ph)->get_priv(ph);
+               struct sensors_info *sinfo = ph->get_priv(ph);
 
                /* payld_sz is variable for this event */
                r->sensor_id = le32_to_cpu(p->sensor_id);
@@ -919,10 +919,9 @@ static void *scmi_sensor_fill_custom_report(const void *ph,
        return rep;
 }
 
-static int scmi_sensor_get_num_sources(const void *ph)
+static int scmi_sensor_get_num_sources(const struct scmi_protocol_handle *ph)
 {
-       struct sensors_info *si =
-               ((const struct scmi_protocol_handle *)ph)->get_priv(ph);
+       struct sensors_info *si = ph->get_priv(ph);
 
        return si->num_sensors;
 }

diff --git a/drivers/firmware/arm_scmi/system.c b/drivers/firmware/arm_scmi/system.c
index ca6fb4698963810366f85f6561bd369d6b065bd8..3631a9f94d277761c4ac3a319a41a923ca07326b 100644 (file)
--- a/drivers/firmware/arm_scmi/system.c
+++ b/drivers/firmware/arm_scmi/system.c
@@ -53,7 +53,7 @@ static int scmi_system_request_notify(const struct scmi_protocol_handle *ph,
        return ret;
 }
 
-static int scmi_system_set_notify_enabled(const void *ph,
+static int scmi_system_set_notify_enabled(const struct scmi_protocol_handle *ph,
                                          u8 evt_id, u32 src_id, bool enable)
 {
        int ret;
@@ -65,10 +65,11 @@ static int scmi_system_set_notify_enabled(const void *ph,
        return ret;
 }
 
-static void *scmi_system_fill_custom_report(const void *ph,
-                                           u8 evt_id, ktime_t timestamp,
-                                           const void *payld, size_t payld_sz,
-                                           void *report, u32 *src_id)
+static void *
+scmi_system_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)
 {
        const struct scmi_system_power_state_notifier_payld *p = payld;
        struct scmi_system_power_state_notifier_report *r = report;