firmware: arm_scmi: Drop redundant ->device_domain_id() from perf ops

There are no longer any users of the ->device_domain_id() ops in the
scmi_perf_proto_ops, therefore let's remove it.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20230825112633.236607-6-ulf.hansson@linaro.org
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c
index 092b51cf9596e3aa553b6bbd4c6aa752e5d65930..9eb58df9124dd8788fe8c75e5987ddf640ef6483 100644 (file)
--- a/drivers/firmware/arm_scmi/perf.c
+++ b/drivers/firmware/arm_scmi/perf.c
@@ -782,18 +782,6 @@ static void scmi_perf_domain_init_fc(const struct scmi_protocol_handle *ph,
        *p_fc = fc;
 }
 
-/* Device specific ops */
-static int scmi_dev_domain_id(struct device *dev)
-{
-       struct of_phandle_args clkspec;
-
-       if (of_parse_phandle_with_args(dev->of_node, "clocks", "#clock-cells",
-                                      0, &clkspec))
-               return -EINVAL;
-
-       return clkspec.args[0];
-}
-
 static int scmi_dvfs_device_opps_add(const struct scmi_protocol_handle *ph,
                                     struct device *dev, u32 domain)
 {
@@ -959,7 +947,6 @@ static const struct scmi_perf_proto_ops perf_proto_ops = {
        .limits_get = scmi_perf_limits_get,
        .level_set = scmi_perf_level_set,
        .level_get = scmi_perf_level_get,
-       .device_domain_id = scmi_dev_domain_id,
        .transition_latency_get = scmi_dvfs_transition_latency_get,
        .device_opps_add = scmi_dvfs_device_opps_add,
        .freq_set = scmi_dvfs_freq_set,

diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index 4e63766adc6f53bcf8e09c9402dfeb6f6bb5d278..27bfa5a65b4507ea888fa6493315d8dcdba9687c 100644 (file)
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -121,7 +121,6 @@ struct scmi_perf_domain_info {
  * @limits_get: gets limits on the performance level of a domain
  * @level_set: sets the performance level of a domain
  * @level_get: gets the performance level of a domain
- * @device_domain_id: gets the scmi domain id for a given device
  * @transition_latency_get: gets the DVFS transition latency for a given device
  * @device_opps_add: adds all the OPPs for a given device
  * @freq_set: sets the frequency for a given device using sustained frequency
@@ -147,7 +146,6 @@ struct scmi_perf_proto_ops {
                         u32 level, bool poll);
        int (*level_get)(const struct scmi_protocol_handle *ph, u32 domain,
                         u32 *level, bool poll);
-       int (*device_domain_id)(struct device *dev);
        int (*transition_latency_get)(const struct scmi_protocol_handle *ph,
                                      u32 domain);
        int (*device_opps_add)(const struct scmi_protocol_handle *ph,