[PATCH v6 17/37] firmware: arm_scmi: remove legacy scmi_power_ops protocol interface

Cristian Marussi
2021-02-02T22:25:30Z

Now that all the SCMI driver users have been migrated to the new interface
remove the legacy interface and all the transient code.

Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
---
drivers/firmware/arm_scmi/power.c | 47 -------------------------------
include/linux/scmi_protocol.h | 11 --------
2 files changed, 58 deletions(-)

diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c
index b3d1c032218c..06e3ab17a0eb 100644
--- a/drivers/firmware/arm_scmi/power.c
+++ b/drivers/firmware/arm_scmi/power.c
@@ -146,15 +146,6 @@ static int scmi_power_state_set(const struct scmi_protocol_handle *ph,
return ret;
}

-static int __scmi_power_state_set(const struct scmi_handle *handle,
- u32 domain, u32 state)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_POWER);
-
- return scmi_power_state_set(ph, domain, state);
-}
-
static int scmi_power_state_get(const struct scmi_protocol_handle *ph,
u32 domain, u32 *state)
{
@@ -175,15 +166,6 @@ static int scmi_power_state_get(const struct scmi_protocol_handle *ph,
return ret;
}

-static int __scmi_power_state_get(const struct scmi_handle *handle,
- u32 domain, u32 *state)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_POWER);
-
- return scmi_power_state_get(ph, domain, state);
-}
-
static int scmi_power_num_domains_get(const struct scmi_protocol_handle *ph)
{
struct scmi_power_info *pi = ph->get_priv(ph);
@@ -191,14 +173,6 @@ static int scmi_power_num_domains_get(const struct scmi_protocol_handle *ph)
return pi->num_domains;
}

-static int __scmi_power_num_domains_get(const struct scmi_handle *handle)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_POWER);
-
- return scmi_power_num_domains_get(ph);
-}
-
static char *scmi_power_name_get(const struct scmi_protocol_handle *ph,
u32 domain)
{
@@ -208,22 +182,6 @@ static char *scmi_power_name_get(const struct scmi_protocol_handle *ph,
return dom->name;
}

-static char *__scmi_power_name_get(const struct scmi_handle *handle,
- u32 domain)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_POWER);
-
- return scmi_power_name_get(ph, domain);
-}
-
-static const struct scmi_power_ops power_ops = {
- .num_domains_get = __scmi_power_num_domains_get,
- .name_get = __scmi_power_name_get,
- .state_set = __scmi_power_state_set,
- .state_get = __scmi_power_state_get,
-};
-
static const struct scmi_power_proto_ops power_proto_ops = {
.num_domains_get = scmi_power_num_domains_get,
.name_get = scmi_power_name_get,
@@ -324,7 +282,6 @@ static int scmi_power_protocol_init(const struct scmi_protocol_handle *ph)
int domain;
u32 version;
struct scmi_power_info *pinfo;
- struct scmi_handle *handle;

ph->xops->version_get(ph, &version);

@@ -350,10 +307,6 @@ static int scmi_power_protocol_init(const struct scmi_protocol_handle *ph)

pinfo->version = version;

- /* Transient code for legacy ops interface */
- handle = scmi_map_scmi_handle(ph);
- handle->power_ops = &power_ops;
-
return ph->set_priv(ph, pinfo);
}

diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index b23c7b8a5f27..794598ce0fc3 100644
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -152,15 +152,6 @@ struct scmi_power_proto_ops {
u32 *state);
};

-struct scmi_power_ops {
- int (*num_domains_get)(const struct scmi_handle *handle);
- char *(*name_get)(const struct scmi_handle *handle, u32 domain);
- int (*state_set)(const struct scmi_handle *handle, u32 domain,
- u32 state);
- int (*state_get)(const struct scmi_handle *handle, u32 domain,
- u32 *state);
-};
-
/**
* scmi_sensor_reading - represent a timestamped read
*
@@ -611,7 +602,6 @@ struct scmi_notify_ops {
*
* @dev: pointer to the SCMI device
* @version: pointer to the structure containing SCMI version information
- * @power_ops: pointer to set of power protocol operations
* @clk_ops: pointer to set of clock protocol operations
* @sensor_ops: pointer to set of sensor protocol operations
* @reset_ops: pointer to set of reset protocol operations
@@ -641,7 +631,6 @@ struct scmi_handle {
struct device *dev;
struct scmi_revision_info *version;
const struct scmi_clk_ops *clk_ops;
- const struct scmi_power_ops *power_ops;
const struct scmi_sensor_ops *sensor_ops;
const struct scmi_reset_ops *reset_ops;
const struct scmi_voltage_ops *voltage_ops;
--
2.17.1