2019-08-13 08:26:59

by Maulik Shah

Subject: [PATCH 1/4] drivers: qcom: rpmh: fix macro to accept NULL argument

Device argument matches with dev variable declared in RPMH message.
Compiler reports error when the argument is NULL since the argument
matches the name of the property. Rename dev argument to device to
fix this.

Signed-off-by: Maulik Shah <[email protected]>
---
drivers/soc/qcom/rpmh.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c
index 035091fd44b8..3a4579d056a4 100644
--- a/drivers/soc/qcom/rpmh.c
+++ b/drivers/soc/qcom/rpmh.c
@@ -23,7 +23,7 @@

#define RPMH_TIMEOUT_MS msecs_to_jiffies(10000)

-#define DEFINE_RPMH_MSG_ONSTACK(dev, s, q, name) \
+#define DEFINE_RPMH_MSG_ONSTACK(device, s, q, name) \
struct rpmh_request name = { \
.msg = { \
.state = s, \
@@ -33,7 +33,7 @@
}, \
.cmd = { { 0 } }, \
.completion = q, \
- .dev = dev, \
+ .dev = device, \
.needs_free = false, \
}

--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation.

2019-08-14 18:01:50

by Stephen Boyd

Subject: Re: [PATCH 1/4] drivers: qcom: rpmh: fix macro to accept NULL argument

Quoting Maulik Shah (2019-08-13 01:24:39)
> Device argument matches with dev variable declared in RPMH message.
> Compiler reports error when the argument is NULL since the argument
> matches the name of the property. Rename dev argument to device to
> fix this.
>
> Signed-off-by: Maulik Shah <[email protected]>
> ---

Maybe this should have a Fixes tag? And the subject could be something
like "avoid shadowing local variables in macro"?

Reviewed-by: Stephen Boyd <[email protected]>