From: Cristian Marussi <cristian.marussi@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: sudeep.holla@arm.com, lukasz.luba@arm.com,
james.quinlan@broadcom.com, Jonathan.Cameron@Huawei.com,
f.fainelli@gmail.com, etienne.carriere@linaro.org,
thara.gopinath@linaro.org, vincent.guittot@linaro.org,
souvik.chakravarty@arm.com, cristian.marussi@arm.com
Subject: [PATCH v5 19/36] firmware: arm_scmi: remove legacy scmi_clk_ops protocol interface
Date: Tue, 12 Jan 2021 19:20:01 +0000 [thread overview]
Message-ID: <20210112192018.34994-20-cristian.marussi@arm.com> (raw)
In-Reply-To: <20210112192018.34994-1-cristian.marussi@arm.com>
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/clock.c | 67 -------------------------------
include/linux/scmi_protocol.h | 15 -------
2 files changed, 82 deletions(-)
diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c
index bf7dcd537fce..a0a6593f464f 100644
--- a/drivers/firmware/arm_scmi/clock.c
+++ b/drivers/firmware/arm_scmi/clock.c
@@ -235,16 +235,6 @@ scmi_clock_rate_get(const struct scmi_protocol_handle *ph,
return ret;
}
-static int
-__scmi_clock_rate_get(const struct scmi_handle *handle,
- u32 clk_id, u64 *value)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_CLOCK);
-
- return scmi_clock_rate_get(ph, clk_id, value);
-}
-
static int scmi_clock_rate_set(const struct scmi_protocol_handle *ph,
u32 clk_id, u64 rate)
{
@@ -280,15 +270,6 @@ static int scmi_clock_rate_set(const struct scmi_protocol_handle *ph,
return ret;
}
-static int __scmi_clock_rate_set(const struct scmi_handle *handle,
- u32 clk_id, u64 rate)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_CLOCK);
-
- return scmi_clock_rate_set(ph, clk_id, rate);
-}
-
static int
scmi_clock_config_set(const struct scmi_protocol_handle *ph, u32 clk_id,
u32 config)
@@ -317,27 +298,11 @@ static int scmi_clock_enable(const struct scmi_protocol_handle *ph, u32 clk_id)
return scmi_clock_config_set(ph, clk_id, CLOCK_ENABLE);
}
-static int __scmi_clock_enable(const struct scmi_handle *handle, u32 clk_id)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_CLOCK);
-
- return scmi_clock_enable(ph, clk_id);
-}
-
static int scmi_clock_disable(const struct scmi_protocol_handle *ph, u32 clk_id)
{
return scmi_clock_config_set(ph, clk_id, 0);
}
-static int __scmi_clock_disable(const struct scmi_handle *handle, u32 clk_id)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_CLOCK);
-
- return scmi_clock_disable(ph, clk_id);
-}
-
static int scmi_clock_count_get(const struct scmi_protocol_handle *ph)
{
struct clock_info *ci = ph->get_priv(ph);
@@ -345,14 +310,6 @@ static int scmi_clock_count_get(const struct scmi_protocol_handle *ph)
return ci->num_clocks;
}
-static int __scmi_clock_count_get(const struct scmi_handle *handle)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_CLOCK);
-
- return scmi_clock_count_get(ph);
-}
-
static const struct scmi_clock_info *
scmi_clock_info_get(const struct scmi_protocol_handle *ph, u32 clk_id)
{
@@ -365,24 +322,6 @@ scmi_clock_info_get(const struct scmi_protocol_handle *ph, u32 clk_id)
return clk;
}
-static const struct scmi_clock_info *
-__scmi_clock_info_get(const struct scmi_handle *handle, u32 clk_id)
-{
- const struct scmi_protocol_handle *ph =
- scmi_map_protocol_handle(handle, SCMI_PROTOCOL_CLOCK);
-
- return scmi_clock_info_get(ph, clk_id);
-}
-
-static const struct scmi_clk_ops clk_ops = {
- .count_get = __scmi_clock_count_get,
- .info_get = __scmi_clock_info_get,
- .rate_get = __scmi_clock_rate_get,
- .rate_set = __scmi_clock_rate_set,
- .enable = __scmi_clock_enable,
- .disable = __scmi_clock_disable,
-};
-
static const struct scmi_clk_proto_ops clk_proto_ops = {
.count_get = scmi_clock_count_get,
.info_get = scmi_clock_info_get,
@@ -397,7 +336,6 @@ static int scmi_clock_protocol_init(const struct scmi_protocol_handle *ph)
u32 version;
int clkid, ret;
struct clock_info *cinfo;
- struct scmi_handle *handle;
ph->xops->version_get(ph, &version);
@@ -424,11 +362,6 @@ static int scmi_clock_protocol_init(const struct scmi_protocol_handle *ph)
}
cinfo->version = version;
-
- /* Transient code for legacy ops interface */
- handle = scmi_map_scmi_handle(ph);
- handle->clk_ops = &clk_ops;
-
return ph->set_priv(ph, cinfo);
}
diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index 86e9df9a15f2..fac87fac4b9c 100644
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -84,19 +84,6 @@ struct scmi_clk_proto_ops {
int (*disable)(const struct scmi_protocol_handle *ph, u32 clk_id);
};
-struct scmi_clk_ops {
- int (*count_get)(const struct scmi_handle *hamdle);
-
- const struct scmi_clock_info *(*info_get)
- (const struct scmi_handle *handle, u32 clk_id);
- int (*rate_get)(const struct scmi_handle *handle, u32 clk_id,
- u64 *rate);
- int (*rate_set)(const struct scmi_handle *handle, u32 clk_id,
- u64 rate);
- int (*enable)(const struct scmi_handle *handle, u32 clk_id);
- int (*disable)(const struct scmi_handle *handle, u32 clk_id);
-};
-
/**
* struct scmi_perf_proto_ops - represents the various operations provided
* by SCMI Performance Protocol
@@ -615,7 +602,6 @@ struct scmi_notify_ops {
*
* @dev: pointer to the SCMI device
* @version: pointer to the structure containing SCMI version information
- * @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
* @voltage_ops: pointer to set of voltage protocol operations
@@ -635,7 +621,6 @@ struct scmi_notify_ops {
struct scmi_handle {
struct device *dev;
struct scmi_revision_info *version;
- const struct scmi_clk_ops *clk_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
next prev parent reply other threads:[~2021-01-12 19:24 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 19:19 [PATCH v5 0/36] SCMI vendor protocols and modularization Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 01/36] firmware: arm_scmi: review protocol registration interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 02/36] firmware: arm_scmi: introduce protocol handle definitions Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 03/36] firmware: arm_scmi: introduce devres get/put protocols operations Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 04/36] firmware: arm_scmi: make notifications aware of protocols users Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 05/36] firmware: arm_scmi: introduce new devres notification ops Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 06/36] firmware: arm_scmi: refactor events registration Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 07/36] firmware: arm_scmi: convert events registration to protocol handles Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 08/36] firmware: arm_scmi: add new protocol handle core xfer ops Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 09/36] firmware: arm_scmi: add helper to access revision area memory Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 10/36] firmware: arm_scmi: port Base protocol to new interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 11/36] firmware: arm_scmi: port Perf protocol to new protocols interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 12/36] cpufreq: scmi: port driver to the new scmi_perf_proto_ops interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 13/36] firmware: arm_scmi: remove legacy scmi_perf_ops protocol interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 14/36] firmware: arm_scmi: port Power protocol to new protocols interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 15/36] firmware: arm_scmi: port GenPD driver to the new scmi_power_proto_ops interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 16/36] firmware: arm_scmi: remove legacy scmi_power_ops protocol interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 17/36] firmware: arm_scmi: port Clock protocol to new protocols interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 18/36] clk: scmi: port driver to the new scmi_clk_proto_ops interface Cristian Marussi
2021-01-12 19:20 ` Cristian Marussi [this message]
2021-01-12 19:20 ` [PATCH v5 20/36] firmware: arm_scmi: port Reset protocol to new protocols interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 21/36] reset: reset-scmi: port driver to the new scmi_reset_proto_ops interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 22/36] firmware: arm_scmi: remove legacy scmi_reset_ops protocol interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 23/36] firmware: arm_scmi: port Sensor protocol to new protocols interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 24/36] hwmon: (scmi) port driver to the new scmi_sensor_proto_ops interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 25/36] firmware: arm_scmi: remove legacy scmi_sensor_ops protocol interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 26/36] firmware: arm_scmi: port SystemPower protocol to new protocols interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 27/36] firmware: arm_scmi: port Voltage " Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 28/36] regulator: scmi: port driver to the new scmi_voltage_proto_ops interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 29/36] firmware: arm_scmi: remove legacy scmi_voltage_ops protocol interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 30/36] firmware: arm_scmi: make references to handle const Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 31/36] firmware: arm_scmi: cleanup legacy protocol init code Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 32/36] firmware: arm_scmi: cleanup unused core xfer wrappers Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 33/36] firmware: arm_scmi: cleanup events registration transient code Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 34/36] firmware: arm_scmi: make notify_priv really private Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 35/36] firmware: arm_scmi: add protocol modularization support Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 36/36] firmware: arm_scmi: add dynamic scmi devices creation Cristian Marussi
2021-01-27 16:21 ` [PATCH v5 0/36] SCMI vendor protocols and modularization Vincent Guittot
2021-01-27 16:26 ` Cristian Marussi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210112192018.34994-20-cristian.marussi@arm.com \
--to=cristian.marussi@arm.com \
--cc=Jonathan.Cameron@Huawei.com \
--cc=etienne.carriere@linaro.org \
--cc=f.fainelli@gmail.com \
--cc=james.quinlan@broadcom.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=souvik.chakravarty@arm.com \
--cc=sudeep.holla@arm.com \
--cc=thara.gopinath@linaro.org \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).