From: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
To: Sudeep Holla <sudeep.holla@kernel.org>,
Cristian Marussi <cristian.marussi@arm.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Peng Fan <peng.fan@nxp.com>,
Frank Li <Frank.Li@nxp.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>
Cc: arm-scmi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
imx@lists.linux.dev,
Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Subject: [PATCH 4/4] firmware: arm_scmi: Use container_of_const() on scmi_protocol_instance
Date: Tue, 24 Feb 2026 11:43:42 +0100 [thread overview]
Message-ID: <20260224-handle-not-const-v1-4-90bf93b53e27@oss.qualcomm.com> (raw)
In-Reply-To: <20260224-handle-not-const-v1-0-90bf93b53e27@oss.qualcomm.com>
Functions receiving pointer to const scmi_protocol_instance, and are not
modifying data in containing struct, can switch to safer
container_of_const() which does not drop the const while casting. This
improves readability because makes the code more obvious.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
drivers/firmware/arm_scmi/driver.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index cc6cdb7017cf..933b90f42794 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -114,6 +114,7 @@ struct scmi_protocol_instance {
};
#define ph_to_pi(h) container_of(h, struct scmi_protocol_instance, ph)
+#define ph_to_pi_const(h) container_of_const(h, struct scmi_protocol_instance, ph)
/**
* struct scmi_info - Structure representing a SCMI instance
@@ -1231,7 +1232,7 @@ static void scmi_rx_callback(struct scmi_chan_info *cinfo, u32 msg_hdr,
static void xfer_put(const struct scmi_protocol_handle *ph,
struct scmi_xfer *xfer)
{
- const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+ const struct scmi_protocol_instance *pi = ph_to_pi_const(ph);
struct scmi_info *info = handle_to_scmi_info(pi->handle);
__scmi_xfer_put(&info->tx_minfo, xfer);
@@ -1394,7 +1395,7 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
struct scmi_xfer *xfer)
{
int ret;
- const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+ const struct scmi_protocol_instance *pi = ph_to_pi_const(ph);
struct scmi_info *info = handle_to_scmi_info(pi->handle);
struct device *dev = info->dev;
struct scmi_chan_info *cinfo;
@@ -1473,7 +1474,7 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
static void reset_rx_to_maxsz(const struct scmi_protocol_handle *ph,
struct scmi_xfer *xfer)
{
- const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+ const struct scmi_protocol_instance *pi = ph_to_pi_const(ph);
struct scmi_info *info = handle_to_scmi_info(pi->handle);
xfer->rx.len = info->desc->max_msg_size;
@@ -1556,7 +1557,7 @@ static int xfer_get_init(const struct scmi_protocol_handle *ph,
{
int ret;
struct scmi_xfer *xfer;
- const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+ const struct scmi_protocol_instance *pi = ph_to_pi_const(ph);
struct scmi_info *info = handle_to_scmi_info(pi->handle);
struct scmi_xfers_info *minfo = &info->tx_minfo;
struct device *dev = info->dev;
@@ -1650,7 +1651,7 @@ static int scmi_set_protocol_priv(struct scmi_protocol_handle *ph,
*/
static void *scmi_get_protocol_priv(const struct scmi_protocol_handle *ph)
{
- const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+ const struct scmi_protocol_instance *pi = ph_to_pi_const(ph);
return pi->priv;
}
@@ -1720,7 +1721,7 @@ static int scmi_common_extended_name_get(const struct scmi_protocol_handle *ph,
*/
static int scmi_common_get_max_msg_size(const struct scmi_protocol_handle *ph)
{
- const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+ const struct scmi_protocol_instance *pi = ph_to_pi_const(ph);
struct scmi_info *info = handle_to_scmi_info(pi->handle);
return info->desc->max_msg_size;
@@ -1914,7 +1915,7 @@ scmi_common_fastchannel_init(const struct scmi_protocol_handle *ph,
struct scmi_fc_db_info *db = NULL;
struct scmi_msg_get_fc_info *info;
struct scmi_msg_resp_desc_fc *resp;
- const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+ const struct scmi_protocol_instance *pi = ph_to_pi_const(ph);
/* Check if the MSG_ID supports fastchannel */
ret = scmi_protocol_msg_check(ph, message_id, &attributes);
@@ -2067,7 +2068,7 @@ static const struct scmi_proto_helpers_ops helpers_ops = {
struct scmi_revision_info *
scmi_revision_area_get(const struct scmi_protocol_handle *ph)
{
- const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+ const struct scmi_protocol_instance *pi = ph_to_pi_const(ph);
return pi->handle->version;
}
@@ -2366,7 +2367,7 @@ void scmi_protocol_release(struct scmi_handle *handle, u8 protocol_id)
void scmi_setup_protocol_implemented(const struct scmi_protocol_handle *ph,
u8 *prot_imp)
{
- const struct scmi_protocol_instance *pi = ph_to_pi(ph);
+ const struct scmi_protocol_instance *pi = ph_to_pi_const(ph);
struct scmi_info *info = handle_to_scmi_info(pi->handle);
info->protocols_imp = prot_imp;
--
2.51.0
next prev parent reply other threads:[~2026-02-24 10:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-24 10:43 [PATCH 0/4] firmware: arm_scmi: Drop fake 'const' on scmi_handle Krzysztof Kozlowski
2026-02-24 10:43 ` [PATCH 1/4] " Krzysztof Kozlowski
2026-02-24 10:43 ` [PATCH 2/4] firmware: arm_scmi: Drop fake 'const' on scmi_protocol_handle Krzysztof Kozlowski
2026-02-24 10:43 ` [PATCH 3/4] firmware: arm_scmi: Use container_of_const() on scmi_handle Krzysztof Kozlowski
2026-02-24 10:43 ` Krzysztof Kozlowski [this message]
2026-02-24 12:31 ` [PATCH 0/4] firmware: arm_scmi: Drop fake 'const' " Cristian Marussi
2026-02-25 11:42 ` Krzysztof Kozlowski
2026-02-26 13:55 ` 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=20260224-handle-not-const-v1-4-90bf93b53e27@oss.qualcomm.com \
--to=krzysztof.kozlowski@oss.qualcomm.com \
--cc=Frank.Li@nxp.com \
--cc=arm-scmi@vger.kernel.org \
--cc=cristian.marussi@arm.com \
--cc=festevam@gmail.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=peng.fan@nxp.com \
--cc=s.hauer@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=sudeep.holla@kernel.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
all inboxes | Powered by JetHome®