2021-03-30 10:34:04

by Álvaro Fernández Rojas

[permalink] [raw]
Subject: [PATCH v2] pinctrl: bcm: bcm6362: fix warning

The current implementation of bcm6362_set_gpio() produces the following
warning on x86_64:
drivers/pinctrl/bcm/pinctrl-bcm6362.c: In function 'bcm6362_set_gpio':
drivers/pinctrl/bcm/pinctrl-bcm6362.c:503:8: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
503 | (uint32_t) desc->drv_data, 0);
| ^

Modify the code to make it similar to bcm63268_set_gpio() in order to fix
the warning.

Fixes: 705791e23ecd ("pinctrl: add a pincontrol driver for BCM6362")
Signed-off-by: Álvaro Fernández Rojas <[email protected]>
---
drivers/pinctrl/bcm/pinctrl-bcm6362.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/bcm/pinctrl-bcm6362.c b/drivers/pinctrl/bcm/pinctrl-bcm6362.c
index eb7ec80353e9..40ef495b6301 100644
--- a/drivers/pinctrl/bcm/pinctrl-bcm6362.c
+++ b/drivers/pinctrl/bcm/pinctrl-bcm6362.c
@@ -496,11 +496,11 @@ static int bcm6362_pinctrl_get_groups(struct pinctrl_dev *pctldev,
static void bcm6362_set_gpio(struct bcm63xx_pinctrl *pc, unsigned pin)
{
const struct pinctrl_pin_desc *desc = &bcm6362_pins[pin];
+ unsigned int basemode = (uintptr_t)desc->drv_data;
unsigned int mask = bcm63xx_bank_pin(pin);

- if (desc->drv_data)
- regmap_update_bits(pc->regs, BCM6362_BASEMODE_REG,
- (uint32_t) desc->drv_data, 0);
+ if (basemode)
+ regmap_update_bits(pc->regs, BCM6362_BASEMODE_REG, basemode, 0);

if (pin < BCM63XX_BANK_GPIOS) {
/* base mode 0 => gpio 1 => mux function */
--
2.20.1


2021-03-30 10:59:40

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH v2] pinctrl: bcm: bcm6362: fix warning

On Tue, Mar 30, 2021 at 1:33 PM Álvaro Fernández Rojas
<[email protected]> wrote:
>
> The current implementation of bcm6362_set_gpio() produces the following
> warning on x86_64:
> drivers/pinctrl/bcm/pinctrl-bcm6362.c: In function 'bcm6362_set_gpio':
> drivers/pinctrl/bcm/pinctrl-bcm6362.c:503:8: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> 503 | (uint32_t) desc->drv_data, 0);
> | ^
>
> Modify the code to make it similar to bcm63268_set_gpio() in order to fix
> the warning.

Seems good to me, thanks!
Reviewed-by: Andy Shevchenko <[email protected]>

> Fixes: 705791e23ecd ("pinctrl: add a pincontrol driver for BCM6362")
> Signed-off-by: Álvaro Fernández Rojas <[email protected]>
> ---

Missed changelog here.

> drivers/pinctrl/bcm/pinctrl-bcm6362.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pinctrl/bcm/pinctrl-bcm6362.c b/drivers/pinctrl/bcm/pinctrl-bcm6362.c
> index eb7ec80353e9..40ef495b6301 100644
> --- a/drivers/pinctrl/bcm/pinctrl-bcm6362.c
> +++ b/drivers/pinctrl/bcm/pinctrl-bcm6362.c
> @@ -496,11 +496,11 @@ static int bcm6362_pinctrl_get_groups(struct pinctrl_dev *pctldev,
> static void bcm6362_set_gpio(struct bcm63xx_pinctrl *pc, unsigned pin)
> {
> const struct pinctrl_pin_desc *desc = &bcm6362_pins[pin];
> + unsigned int basemode = (uintptr_t)desc->drv_data;
> unsigned int mask = bcm63xx_bank_pin(pin);
>
> - if (desc->drv_data)
> - regmap_update_bits(pc->regs, BCM6362_BASEMODE_REG,
> - (uint32_t) desc->drv_data, 0);
> + if (basemode)
> + regmap_update_bits(pc->regs, BCM6362_BASEMODE_REG, basemode, 0);
>
> if (pin < BCM63XX_BANK_GPIOS) {
> /* base mode 0 => gpio 1 => mux function */
> --
> 2.20.1
>


--
With Best Regards,
Andy Shevchenko

2021-03-30 13:42:59

by Álvaro Fernández Rojas

[permalink] [raw]
Subject: Re: [PATCH v2] pinctrl: bcm: bcm6362: fix warning

Hi Andy,

El 30/03/2021 a las 12:55, Andy Shevchenko escribió:
> On Tue, Mar 30, 2021 at 1:33 PM Álvaro Fernández Rojas
> <[email protected]> wrote:
>>
>> The current implementation of bcm6362_set_gpio() produces the following
>> warning on x86_64:
>> drivers/pinctrl/bcm/pinctrl-bcm6362.c: In function 'bcm6362_set_gpio':
>> drivers/pinctrl/bcm/pinctrl-bcm6362.c:503:8: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>> 503 | (uint32_t) desc->drv_data, 0);
>> | ^
>>
>> Modify the code to make it similar to bcm63268_set_gpio() in order to fix
>> the warning.
>
> Seems good to me, thanks!
> Reviewed-by: Andy Shevchenko <[email protected]>
>
>> Fixes: 705791e23ecd ("pinctrl: add a pincontrol driver for BCM6362")
>> Signed-off-by: Álvaro Fernández Rojas <[email protected]>
>> ---
>
> Missed changelog here.

Yes, sorry about that but I added it to v1 patch by mistake... ;D
v2: use uintptr_t, remove unneeded space and modify put
regmap_update_bits() call on a single line.

>
>> drivers/pinctrl/bcm/pinctrl-bcm6362.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/pinctrl/bcm/pinctrl-bcm6362.c b/drivers/pinctrl/bcm/pinctrl-bcm6362.c
>> index eb7ec80353e9..40ef495b6301 100644
>> --- a/drivers/pinctrl/bcm/pinctrl-bcm6362.c
>> +++ b/drivers/pinctrl/bcm/pinctrl-bcm6362.c
>> @@ -496,11 +496,11 @@ static int bcm6362_pinctrl_get_groups(struct pinctrl_dev *pctldev,
>> static void bcm6362_set_gpio(struct bcm63xx_pinctrl *pc, unsigned pin)
>> {
>> const struct pinctrl_pin_desc *desc = &bcm6362_pins[pin];
>> + unsigned int basemode = (uintptr_t)desc->drv_data;
>> unsigned int mask = bcm63xx_bank_pin(pin);
>>
>> - if (desc->drv_data)
>> - regmap_update_bits(pc->regs, BCM6362_BASEMODE_REG,
>> - (uint32_t) desc->drv_data, 0);
>> + if (basemode)
>> + regmap_update_bits(pc->regs, BCM6362_BASEMODE_REG, basemode, 0);
>>
>> if (pin < BCM63XX_BANK_GPIOS) {
>> /* base mode 0 => gpio 1 => mux function */
>> --
>> 2.20.1
>>
>
>

Best regards,
Álvaro.

2021-03-31 12:37:11

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH v2] pinctrl: bcm: bcm6362: fix warning

On Tue, Mar 30, 2021 at 12:32 PM Álvaro Fernández Rojas
<[email protected]> wrote:

> The current implementation of bcm6362_set_gpio() produces the following
> warning on x86_64:
> drivers/pinctrl/bcm/pinctrl-bcm6362.c: In function 'bcm6362_set_gpio':
> drivers/pinctrl/bcm/pinctrl-bcm6362.c:503:8: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> 503 | (uint32_t) desc->drv_data, 0);
> | ^
>
> Modify the code to make it similar to bcm63268_set_gpio() in order to fix
> the warning.
>
> Fixes: 705791e23ecd ("pinctrl: add a pincontrol driver for BCM6362")
> Signed-off-by: Álvaro Fernández Rojas <[email protected]>

Patch applied! Thanks!

Yours,
Linus Walleij