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

[Matthias Kaehlcke]

Hi Maulik,

this patch and '[v5,2/7] drivers: qcom: rpmh: remove rpmh_flush
export' already landed in the QCOM tree (in the branch 'drivers-for-5.7'):

d5e205079c34a drivers: qcom: rpmh: remove rpmh_flush export
aff9cc0847a58 drivers: qcom: rpmh: fix macro to accept NULL argument

Please rebase your working tree and stop sending these.

Thanks

Matthias

On Wed, Feb 19, 2020 at 04:10:04PM +0530, Maulik Shah wrote:
> 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@xxxxxxxxxxxxxx>
> Reviewed-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
> ---
>  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 035091f..3a4579d 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 Code Aurora Forum, hosted by The Linux Foundation