[PATCH] leds: pm8058: Make ledtype pointer sized type

[PATCH] leds: pm8058: Make ledtype pointer sized type

[Bjorn Andersson]

The pointer returned by of_device_get_match_data() doesn't have the same
size as u32 on 64-bit architectures, causing issues when compile testing
the driver on such platform. Make ledtype unsigned long instead, to
solve this problem.

Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/leds/leds-pm8058.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
index a52674327857..cc2afe81720d 100644
--- a/drivers/leds/leds-pm8058.c
+++ b/drivers/leds/leds-pm8058.c
@@ -29,7 +29,7 @@
 struct pm8058_led {
 	struct regmap *map;
 	u32 reg;
-	u32 ledtype;
+	unsigned long ledtype;
 	struct led_classdev cdev;
 };
 
@@ -106,7 +106,7 @@ static int pm8058_led_probe(struct platform_device *pdev)
 	if (!led)
 		return -ENOMEM;
 
-	led->ledtype = (u32)of_device_get_match_data(&pdev->dev);
+	led->ledtype = (unsigned long)of_device_get_match_data(&pdev->dev);
 
 	map = dev_get_regmap(pdev->dev.parent, NULL);
 	if (!map) {
-- 
2.15.0

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Lee Jones]

On Wed, 29 Nov 2017, Bjorn Andersson wrote:

> The pointer returned by of_device_get_match_data() doesn't have the same
> size as u32 on 64-bit architectures, causing issues when compile testing
> the driver on such platform. Make ledtype unsigned long instead, to
> solve this problem.
> 
> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>  drivers/leds/leds-pm8058.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Hi Bjorn,

(Nice to see you) :)

I'm going to apply this *before* Linus' fix.

Applied, thanks.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Lee Jones]

On Thu, 30 Nov 2017, Lee Jones wrote:

> On Wed, 29 Nov 2017, Bjorn Andersson wrote:
> 
> > The pointer returned by of_device_get_match_data() doesn't have the same
> > size as u32 on 64-bit architectures, causing issues when compile testing
> > the driver on such platform. Make ledtype unsigned long instead, to
> > solve this problem.
> > 
> > Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > ---
> >  drivers/leds/leds-pm8058.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Hi Bjorn,
> 
> (Nice to see you) :)
> 
> I'm going to apply this *before* Linus' fix.
> 
> Applied, thanks.

After I rx an Ack from Richard, Jacek or Pavel of course. :)

Will send a pull-request.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Jacek Anaszewski]

On 11/30/2017 09:31 AM, Lee Jones wrote:
> On Thu, 30 Nov 2017, Lee Jones wrote:
> 
>> On Wed, 29 Nov 2017, Bjorn Andersson wrote:
>>
>>> The pointer returned by of_device_get_match_data() doesn't have the same
>>> size as u32 on 64-bit architectures, causing issues when compile testing
>>> the driver on such platform. Make ledtype unsigned long instead, to
>>> solve this problem.
>>>
>>> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
>>> Cc: Linus Walleij <linus.walleij@linaro.org>
>>> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
>>> ---
>>>  drivers/leds/leds-pm8058.c | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> Hi Bjorn,
>>
>> (Nice to see you) :)
>>
>> I'm going to apply this *before* Linus' fix.
>>
>> Applied, thanks.
> 
> After I rx an Ack from Richard, Jacek or Pavel of course. :)
> 
> Will send a pull-request.

Huh? This is for LED subsystem AFAICS.

-- 
Best regards,
Jacek Anaszewski

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Lee Jones]

On Thu, 30 Nov 2017, Jacek Anaszewski wrote:

> On 11/30/2017 09:31 AM, Lee Jones wrote:
> > On Thu, 30 Nov 2017, Lee Jones wrote:
> > 
> >> On Wed, 29 Nov 2017, Bjorn Andersson wrote:
> >>
> >>> The pointer returned by of_device_get_match_data() doesn't have the same
> >>> size as u32 on 64-bit architectures, causing issues when compile testing
> >>> the driver on such platform. Make ledtype unsigned long instead, to
> >>> solve this problem.
> >>>
> >>> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> >>> Cc: Linus Walleij <linus.walleij@linaro.org>
> >>> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> >>> ---
> >>>  drivers/leds/leds-pm8058.c | 4 ++--
> >>>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> Hi Bjorn,
> >>
> >> (Nice to see you) :)
> >>
> >> I'm going to apply this *before* Linus' fix.
> >>
> >> Applied, thanks.
> > 
> > After I rx an Ack from Richard, Jacek or Pavel of course. :)
> > 
> > Will send a pull-request.
> 
> Huh? This is for LED subsystem AFAICS.

Right, hence why I said I'd sent out a pull-request.

The problem, however, arose due to a change in its parent driver's
Kconfig entry, which has been applied to the MFD tree.  We need to
ensure this patch is applied *before* the other 'fix' to quash the
warning before it starts, so to speak.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Jacek Anaszewski]

On 12/01/2017 08:56 AM, Lee Jones wrote:
> On Thu, 30 Nov 2017, Jacek Anaszewski wrote:
> 
>> On 11/30/2017 09:31 AM, Lee Jones wrote:
>>> On Thu, 30 Nov 2017, Lee Jones wrote:
>>>
>>>> On Wed, 29 Nov 2017, Bjorn Andersson wrote:
>>>>
>>>>> The pointer returned by of_device_get_match_data() doesn't have the same
>>>>> size as u32 on 64-bit architectures, causing issues when compile testing
>>>>> the driver on such platform. Make ledtype unsigned long instead, to
>>>>> solve this problem.
>>>>>
>>>>> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
>>>>> Cc: Linus Walleij <linus.walleij@linaro.org>
>>>>> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
>>>>> ---
>>>>>  drivers/leds/leds-pm8058.c | 4 ++--
>>>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> Hi Bjorn,
>>>>
>>>> (Nice to see you) :)
>>>>
>>>> I'm going to apply this *before* Linus' fix.
>>>>
>>>> Applied, thanks.
>>>
>>> After I rx an Ack from Richard, Jacek or Pavel of course. :)
>>>
>>> Will send a pull-request.
>>
>> Huh? This is for LED subsystem AFAICS.
> 
> Right, hence why I said I'd sent out a pull-request.
> 
> The problem, however, arose due to a change in its parent driver's
> Kconfig entry, which has been applied to the MFD tree.  We need to
> ensure this patch is applied *before* the other 'fix' to quash the
> warning before it starts, so to speak.

Ah, I hadn't seen the MFD patch and understood that you was
talking about pull request for 4.15-rc2, which looked a bit
strange out of context.

For v2:

Acked-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>

-- 
Best regards,
Jacek Anaszewski

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Linus Walleij]

On Thu, Nov 30, 2017 at 4:05 AM, Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:

> The pointer returned by of_device_get_match_data() doesn't have the same
> size as u32 on 64-bit architectures, causing issues when compile testing
> the driver on such platform. Make ledtype unsigned long instead, to
> solve this problem.
>
> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Thanks for covering my ass.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Lee Jones]

On Thu, 30 Nov 2017, Linus Walleij wrote:

> On Thu, Nov 30, 2017 at 4:05 AM, Bjorn Andersson
> <bjorn.andersson@linaro.org> wrote:
> 
> > The pointer returned by of_device_get_match_data() doesn't have the same
> > size as u32 on 64-bit architectures, causing issues when compile testing
> > the driver on such platform. Make ledtype unsigned long instead, to
> > solve this problem.
> >
> > Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> 
> Thanks for covering my ass.

:D

> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

I still need a LED Ack if I'm going to take this.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

On Wed 2017-11-29 19:05:43, Bjorn Andersson wrote:
> The pointer returned by of_device_get_match_data() doesn't have the same
> size as u32 on 64-bit architectures, causing issues when compile testing
> the driver on such platform. Make ledtype unsigned long instead, to
> solve this problem.
> 
> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Ummm... no?

extern const void *of_device_get_match_data(const struct device *dev);


> diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
> index a52674327857..cc2afe81720d 100644
> --- a/drivers/leds/leds-pm8058.c
> +++ b/drivers/leds/leds-pm8058.c
> @@ -29,7 +29,7 @@
>  struct pm8058_led {
>  	struct regmap *map;
>  	u32 reg;
> -	u32 ledtype;
> +	unsigned long ledtype;

Make it void *. u32 is buggy. unsigned long is merely ugly code. void
* is not nice, but certainly better than unsigned long.

Thanks,
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Jacek Anaszewski]

On 11/30/2017 10:40 AM, Pavel Machek wrote:
> On Wed 2017-11-29 19:05:43, Bjorn Andersson wrote:
>> The pointer returned by of_device_get_match_data() doesn't have the same
>> size as u32 on 64-bit architectures, causing issues when compile testing
>> the driver on such platform. Make ledtype unsigned long instead, to
>> solve this problem.
>>
>> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> 
> Ummm... no?
> 
> extern const void *of_device_get_match_data(const struct device *dev);
> 
> 
>> diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
>> index a52674327857..cc2afe81720d 100644
>> --- a/drivers/leds/leds-pm8058.c
>> +++ b/drivers/leds/leds-pm8058.c
>> @@ -29,7 +29,7 @@
>>  struct pm8058_led {
>>  	struct regmap *map;
>>  	u32 reg;
>> -	u32 ledtype;
>> +	unsigned long ledtype;
> 
> Make it void *. u32 is buggy. unsigned long is merely ugly code. void
> * is not nice, but certainly better than unsigned long.

unsigned long is correct, see below:

static const struct of_device_id pm8058_leds_id_table[] = {
        {
                .compatible = "qcom,pm8058-led",
                .data = (void *)PM8058_LED_TYPE_COMMON
        },
        {
                .compatible = "qcom,pm8058-keypad-led",
                .data = (void *)PM8058_LED_TYPE_KEYPAD
        },
        {
                .compatible = "qcom,pm8058-flash-led",
                .data = (void *)PM8058_LED_TYPE_FLASH
        },
        { },
};

of_device_get_match_data will return PM8058_LED_TYPE_*
which clearly is a led type identifier.

Thus unsigned long looks reasonable.

-- 
Best regards,
Jacek Anaszewski

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 2388 bytes --]

On Thu 2017-11-30 22:58:55, Jacek Anaszewski wrote:
> On 11/30/2017 10:40 AM, Pavel Machek wrote:
> > On Wed 2017-11-29 19:05:43, Bjorn Andersson wrote:
> >> The pointer returned by of_device_get_match_data() doesn't have the same
> >> size as u32 on 64-bit architectures, causing issues when compile testing
> >> the driver on such platform. Make ledtype unsigned long instead, to
> >> solve this problem.
> >>
> >> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> >> Cc: Linus Walleij <linus.walleij@linaro.org>
> >> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > 
> > Ummm... no?
> > 
> > extern const void *of_device_get_match_data(const struct device *dev);
> > 
> > 
> >> diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
> >> index a52674327857..cc2afe81720d 100644
> >> --- a/drivers/leds/leds-pm8058.c
> >> +++ b/drivers/leds/leds-pm8058.c
> >> @@ -29,7 +29,7 @@
> >>  struct pm8058_led {
> >>  	struct regmap *map;
> >>  	u32 reg;
> >> -	u32 ledtype;
> >> +	unsigned long ledtype;
> > 
> > Make it void *. u32 is buggy. unsigned long is merely ugly code. void
> > * is not nice, but certainly better than unsigned long.
> 
> unsigned long is correct, see below:
> 
> static const struct of_device_id pm8058_leds_id_table[] = {
>         {
>                 .compatible = "qcom,pm8058-led",
>                 .data = (void *)PM8058_LED_TYPE_COMMON
>         },
>         {
>                 .compatible = "qcom,pm8058-keypad-led",
>                 .data = (void *)PM8058_LED_TYPE_KEYPAD
>         },
>         {
>                 .compatible = "qcom,pm8058-flash-led",
>                 .data = (void *)PM8058_LED_TYPE_FLASH
>         },
>         { },
> };
> 
> of_device_get_match_data will return PM8058_LED_TYPE_*
> which clearly is a led type identifier.
> 
> Thus unsigned long looks reasonable.

Hmm. Ok. So u32 would actually make even more sense there (because
PM8058_LED_TYPE_* does not really need to be 64-bit), but it would
cause a warning.

I don't like this. This fix actually makes code waste memory and is
uglier.

...but we get a warning fix. So I don't like the patch, but it is an
improvement...

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Stephen Rothwell]

Hi Pavel,

On Thu, 30 Nov 2017 23:34:07 +0100 Pavel Machek <pavel@ucw.cz> wrote:
>
> On Thu 2017-11-30 22:58:55, Jacek Anaszewski wrote:
> > On 11/30/2017 10:40 AM, Pavel Machek wrote:  
> > > On Wed 2017-11-29 19:05:43, Bjorn Andersson wrote:  
> > >> The pointer returned by of_device_get_match_data() doesn't have the same
> > >> size as u32 on 64-bit architectures, causing issues when compile testing
> > >> the driver on such platform. Make ledtype unsigned long instead, to
> > >> solve this problem.
> > >>
> > >> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> > >> Cc: Linus Walleij <linus.walleij@linaro.org>
> > >> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>  
> > > 
> > > Ummm... no?
> > > 
> > > extern const void *of_device_get_match_data(const struct device *dev);
> > > 
> > >   
> > >> diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
> > >> index a52674327857..cc2afe81720d 100644
> > >> --- a/drivers/leds/leds-pm8058.c
> > >> +++ b/drivers/leds/leds-pm8058.c
> > >> @@ -29,7 +29,7 @@
> > >>  struct pm8058_led {
> > >>  	struct regmap *map;
> > >>  	u32 reg;
> > >> -	u32 ledtype;
> > >> +	unsigned long ledtype;  
> > > 
> > > Make it void *. u32 is buggy. unsigned long is merely ugly code. void
> > > * is not nice, but certainly better than unsigned long.  
> > 
> > unsigned long is correct, see below:
> > 
> > static const struct of_device_id pm8058_leds_id_table[] = {
> >         {
> >                 .compatible = "qcom,pm8058-led",
> >                 .data = (void *)PM8058_LED_TYPE_COMMON
> >         },
> >         {
> >                 .compatible = "qcom,pm8058-keypad-led",
> >                 .data = (void *)PM8058_LED_TYPE_KEYPAD
> >         },
> >         {
> >                 .compatible = "qcom,pm8058-flash-led",
> >                 .data = (void *)PM8058_LED_TYPE_FLASH
> >         },
> >         { },
> > };
> > 
> > of_device_get_match_data will return PM8058_LED_TYPE_*
> > which clearly is a led type identifier.
> > 
> > Thus unsigned long looks reasonable.  
> 
> Hmm. Ok. So u32 would actually make even more sense there (because
> PM8058_LED_TYPE_* does not really need to be 64-bit), but it would
> cause a warning.
> 
> I don't like this. This fix actually makes code waste memory and is
> uglier.
> 
> ...but we get a warning fix. So I don't like the patch, but it is an
> improvement...

I *think* you can get away with (u32)(unsigned long)ptr ...
-- 
Cheers,
Stephen Rothwell

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]

Hi!

> > > of_device_get_match_data will return PM8058_LED_TYPE_*
> > > which clearly is a led type identifier.
> > > 
> > > Thus unsigned long looks reasonable.  
> > 
> > Hmm. Ok. So u32 would actually make even more sense there (because
> > PM8058_LED_TYPE_* does not really need to be 64-bit), but it would
> > cause a warning.
> > 
> > I don't like this. This fix actually makes code waste memory and is
> > uglier.
> > 
> > ...but we get a warning fix. So I don't like the patch, but it is an
> > improvement...
> 
> I *think* you can get away with (u32)(unsigned long)ptr ...

Yes, that should work. It would actually be my preferred solution.

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Bjorn Andersson]

On Thu 30 Nov 16:28 PST 2017, Pavel Machek wrote:

> Hi!
> 
> > > > of_device_get_match_data will return PM8058_LED_TYPE_*
> > > > which clearly is a led type identifier.
> > > > 
> > > > Thus unsigned long looks reasonable.  
> > > 
> > > Hmm. Ok. So u32 would actually make even more sense there (because
> > > PM8058_LED_TYPE_* does not really need to be 64-bit), but it would
> > > cause a warning.
> > > 
> > > I don't like this. This fix actually makes code waste memory and is
> > > uglier.
> > > 
> > > ...but we get a warning fix. So I don't like the patch, but it is an
> > > improvement...
> > 
> > I *think* you can get away with (u32)(unsigned long)ptr ...
> 
> Yes, that should work. It would actually be my preferred solution.
> 

I'm fine with this suggestion, and it silence the warning. I will update
and resend the patch.

Regards,
Bjorn

Re: [PATCH] leds: pm8058: Make ledtype pointer sized type

[Bjorn Andersson]

On Thu 30 Nov 01:40 PST 2017, Pavel Machek wrote:

> On Wed 2017-11-29 19:05:43, Bjorn Andersson wrote:
> > The pointer returned by of_device_get_match_data() doesn't have the same
> > size as u32 on 64-bit architectures, causing issues when compile testing
> > the driver on such platform. Make ledtype unsigned long instead, to
> > solve this problem.
> > 
> > Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> 
> Ummm... no?
> 
> extern const void *of_device_get_match_data(const struct device *dev);
> 

Right, this returns a pointer, which is of architecture dependent size.

> 
> > diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
> > index a52674327857..cc2afe81720d 100644
> > --- a/drivers/leds/leds-pm8058.c
> > +++ b/drivers/leds/leds-pm8058.c
> > @@ -29,7 +29,7 @@
> >  struct pm8058_led {
> >  	struct regmap *map;
> >  	u32 reg;
> > -	u32 ledtype;
> > +	unsigned long ledtype;
> 
> Make it void *. u32 is buggy. unsigned long is merely ugly code. void
> * is not nice, but certainly better than unsigned long.
> 

unsigned long is the integer type in the kernel that has the same size
as a pointer, similar to the C-standard's intptr_t. So this is the
idiomatic way to pass an integer data type via a pointer variable in the
kernel.

Regards,
Bjorn

[PATCH v2] leds: pm8058: Silence pointer to integer size warning

[Bjorn Andersson]

The pointer returned by of_device_get_match_data() doesn't have the same
size as u32 on 64-bit architectures, causing a compile warning when
compile-testing the driver on such platform.

Cast the return value of of_device_get_match_data() to unsigned long and
then to u32 to silence this warning.

Cc: Linus Walleij <linus.walleij@linaro.org>
Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/leds/leds-pm8058.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
index a52674327857..8988ba3b2d65 100644
--- a/drivers/leds/leds-pm8058.c
+++ b/drivers/leds/leds-pm8058.c
@@ -106,7 +106,7 @@ static int pm8058_led_probe(struct platform_device *pdev)
 	if (!led)
 		return -ENOMEM;
 
-	led->ledtype = (u32)of_device_get_match_data(&pdev->dev);
+	led->ledtype = (u32)(unsigned long)of_device_get_match_data(&pdev->dev);
 
 	map = dev_get_regmap(pdev->dev.parent, NULL);
 	if (!map) {
-- 
2.15.0

Re: [PATCH v2] leds: pm8058: Silence pointer to integer size warning

[Lee Jones]

On Thu, 30 Nov 2017, Bjorn Andersson wrote:

> The pointer returned by of_device_get_match_data() doesn't have the same
> size as u32 on 64-bit architectures, causing a compile warning when
> compile-testing the driver on such platform.
> 
> Cast the return value of of_device_get_match_data() to unsigned long and
> then to u32 to silence this warning.
> 
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>  drivers/leds/leds-pm8058.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
> index a52674327857..8988ba3b2d65 100644
> --- a/drivers/leds/leds-pm8058.c
> +++ b/drivers/leds/leds-pm8058.c
> @@ -106,7 +106,7 @@ static int pm8058_led_probe(struct platform_device *pdev)
>  	if (!led)
>  		return -ENOMEM;
>  
> -	led->ledtype = (u32)of_device_get_match_data(&pdev->dev);
> +	led->ledtype = (u32)(unsigned long)of_device_get_match_data(&pdev->dev);

Wouldn't (u32)(void *) be even more correct?

... if the compiler will let you get away with it.

>  	map = dev_get_regmap(pdev->dev.parent, NULL);
>  	if (!map) {

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2] leds: pm8058: Silence pointer to integer size warning

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]

On Fri 2017-12-01 07:57:15, Lee Jones wrote:
> On Thu, 30 Nov 2017, Bjorn Andersson wrote:
> 
> > The pointer returned by of_device_get_match_data() doesn't have the same
> > size as u32 on 64-bit architectures, causing a compile warning when
> > compile-testing the driver on such platform.
> > 
> > Cast the return value of of_device_get_match_data() to unsigned long and
> > then to u32 to silence this warning.
> > 
> > Cc: Linus Walleij <linus.walleij@linaro.org>
> > Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Thanks!

Acked-by: Pavel Machek <pavel@ucw.cz>

> > diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
> > index a52674327857..8988ba3b2d65 100644
> > --- a/drivers/leds/leds-pm8058.c
> > +++ b/drivers/leds/leds-pm8058.c
> > @@ -106,7 +106,7 @@ static int pm8058_led_probe(struct platform_device *pdev)
> >  	if (!led)
> >  		return -ENOMEM;
> >  
> > -	led->ledtype = (u32)of_device_get_match_data(&pdev->dev);
> > +	led->ledtype = (u32)(unsigned long)of_device_get_match_data(&pdev->dev);
> 
> Wouldn't (u32)(void *) be even more correct?
> 
> ... if the compiler will let you get away with it.

Afaict that would still produce the warning. of_device_get_match_data
already returns void *.

									Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH v2] leds: pm8058: Silence pointer to integer size warning

[Lee Jones]

On Fri, 01 Dec 2017, Pavel Machek wrote:

> On Fri 2017-12-01 07:57:15, Lee Jones wrote:
> > On Thu, 30 Nov 2017, Bjorn Andersson wrote:
> > > -	led->ledtype = (u32)of_device_get_match_data(&pdev->dev);
> > > +	led->ledtype = (u32)(unsigned long)of_device_get_match_data(&pdev->dev);
> > 
> > Wouldn't (u32)(void *) be even more correct?
> > 
> > ... if the compiler will let you get away with it.
> 
> Afaict that would still produce the warning. of_device_get_match_data
> already returns void *.

Just tested.  It actually still suffers from the original error.

warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v2] leds: pm8058: Silence pointer to integer size warning

[Lee Jones]

On Thu, 30 Nov 2017, Bjorn Andersson wrote:

> The pointer returned by of_device_get_match_data() doesn't have the same
> size as u32 on 64-bit architectures, causing a compile warning when
> compile-testing the driver on such platform.
> 
> Cast the return value of of_device_get_match_data() to unsigned long and
> then to u32 to silence this warning.
> 
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Fixes: 7f866986e705 ("leds: add PM8058 LEDs driver")
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
>  drivers/leds/leds-pm8058.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied with Pavel's Ack thanks.

Will send out a pull-request shortly.

> diff --git a/drivers/leds/leds-pm8058.c b/drivers/leds/leds-pm8058.c
> index a52674327857..8988ba3b2d65 100644
> --- a/drivers/leds/leds-pm8058.c
> +++ b/drivers/leds/leds-pm8058.c
> @@ -106,7 +106,7 @@ static int pm8058_led_probe(struct platform_device *pdev)
>  	if (!led)
>  		return -ENOMEM;
>  
> -	led->ledtype = (u32)of_device_get_match_data(&pdev->dev);
> +	led->ledtype = (u32)(unsigned long)of_device_get_match_data(&pdev->dev);
>  
>  	map = dev_get_regmap(pdev->dev.parent, NULL);
>  	if (!map) {

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

[GIT PULL] Immutable branch between MFD and LED due for the v4.16 merge window

[Lee Jones]

Enjoy!

The following changes since commit 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323:

  Linux 4.15-rc1 (2017-11-26 16:01:47 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-leds-v4.16

for you to fetch changes up to 8f52df50d9366f770a894d14ef724e5e04574e98:

  leds: pm8058: Silence pointer to integer size warning (2017-12-01 08:57:42 +0000)

----------------------------------------------------------------
Immutable branch between MFD and LED due for the v4.16 merge window

----------------------------------------------------------------
Bjorn Andersson (1):
      leds: pm8058: Silence pointer to integer size warning

 drivers/leds/leds-pm8058.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog