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 <mkshah@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/1580736940-6985-2-git-send-email-mkshah@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c
index 035091fd44b803cb131b6ff5b7e5cbd414e52010..3a4579d056a40cfaa04b97f61090bd3b06a88b45 100644 (file)
--- 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,                            \
        }