diff mbox

mfd: Fix MACRO for commonly declared MFD cell attributes

Message ID 20160219085019.GA3410@x1
State New
Headers show

Commit Message

Lee Jones Feb. 19, 2016, 8:50 a.m. UTC
On Thu, 18 Feb 2016, Rhyland Klein wrote:

> MFD_ARRAY_SIZE() would not accurately return 0 if the passed

> parameter was NULL. Fix this so that num_resources will

> accurately be 0 in the case that _res is NULL.

> 

> cc: Lee Jones <lee.jones@linaro.org>

> cc: Laxman Dewangan <ldewangan@nvidia.com>

> Signed-off-by: Rhyland Klein <rklein@nvidia.com>

> ---

>  include/linux/mfd/core.h | 15 +++++++++------

>  1 file changed, 9 insertions(+), 6 deletions(-)

> 

> diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h

> index 1a5a87f3cd38..62136ccff1df 100644

> --- a/include/linux/mfd/core.h

> +++ b/include/linux/mfd/core.h

> @@ -18,11 +18,11 @@

>  

>  #define MFD_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

>  

> -#define MFD_CELL_ALL(_name, _res, _pdata, _id, _compat, _match)		\

> +#define MFD_CELL_ALL(_name, _nres, _res, _pdata, _id, _compat, _match)	\

>  	{								\

>  		.name = (_name),					\

>  		.resources = (_res),					\

> -		.num_resources = MFD_ARRAY_SIZE((_res)),		\

> +		.num_resources = (_nres),				\

>  		.platform_data = (_pdata),				\

>  		.pdata_size = MFD_ARRAY_SIZE((_pdata)), 		\

>  		.of_compatible = (_compat),				\

> @@ -31,16 +31,19 @@

>  	}

>  

>  #define OF_MFD_CELL(_name, _res, _pdata, _id, _compat)			\

> -		MFD_CELL_ALL(_name, _res, _pdata, _id, _compat, NULL)	\

> +		MFD_CELL_ALL(_name, MFD_ARRAY_SIZE((_res)), _res,	\

> +			_pdata, _id, _compat, NULL)			\


I'm confused.  Why would it be any different just by changing the call
site of MFD_ARRAY_SIZE?

And what about .platform_data?

How about this change instead?


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

Comments

Lee Jones March 2, 2016, 1:08 p.m. UTC | #1
On Mon, 29 Feb 2016, Laxman Dewangan wrote:

> 

> On Friday 26 February 2016 10:05 PM, Rhyland Klein wrote:

> >On 2/19/2016 11:28 AM, Rhyland Klein wrote:

> >>On 2/19/2016 3:50 AM, Lee Jones wrote:

> >>>On Thu, 18 Feb 2016, Rhyland Klein wrote:

> >>>

> >>>>  #define MFD_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

> >>>>-#define MFD_CELL_ALL(_name, _res, _pdata, _id, _compat, _match)		\

> >>>>+#define MFD_CELL_ALL(_name, _nres, _res, _pdata, _id, _compat, _match)	\

> >>>>  	{								\

> >>>>  		.name = (_name),					\

> >>>>  		.resources = (_res),					\

> >>>>-		.num_resources = MFD_ARRAY_SIZE((_res)),		\

> >>>>+		.num_resources = (_nres),				\

> >>>>  		.platform_data = (_pdata),				\

> >>>>  		.pdata_size = MFD_ARRAY_SIZE((_pdata)), 		\

> The pdata_size initialization is also not correct. This is not the

> array count but the size

> of the platform data which is passed. Should be sizeof((_pdata))

> 

> 

> 

> >>  #define MFD_CELL_ALL(_name, _res, _pdata, _id, _compat, _match)                \

> >>         {                                                               \

> >>

> >>That was my first thought too. However, I see this when I try to compile

> >>that:

> >>

> >>In file included from drivers/mfd/max77620.c:18:0:

> >>include/linux/mfd/core.h:19:34: warning: the address of ‘gpio_resources’

> >>will always evaluate as ‘true’ [-Waddress]

> >>  #define MFD_ARRAY_SIZE(arr) (arr ? (sizeof(arr) / sizeof((arr)[0])) : 0)

> >>

> >>7 different times. This patch was the only way I seemed to be able to

> >>WAR around compile time warnings.

> >>

> >>-rhyland

> >>

> >Did you not see warnings like this when you compiled the kernel? Did you

> >find a different approach than what I proposed above to deal with it?

> >I'd like to get this in soon so that when the max77620 drivers are all

> >in and using it, it should be functional.

> >

> I think the following change also crash in runtime:

> 

> /***

> commit e60a946f05db2cac857025da6ffb72df48d3be54

> Author: Lee Jones <lee.jones@linaro.org>

> 

>     mfd: ab8500: Provide a small example using new MFD cell MACROs

> 

> ***/

> 

> Should we have something MFD_CELL_RES, MFD_CELL_RES_PDATA,

> MFD_CELL_PDATA, for more common user and not to pass the NULL here.


I'll have a re-think about this.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Lee Jones March 11, 2016, 8:39 a.m. UTC | #2
On Wed, 09 Mar 2016, Laxman Dewangan wrote:
> On Wednesday 02 March 2016 06:38 PM, Lee Jones wrote:

> >On Mon, 29 Feb 2016, Laxman Dewangan wrote:

> >

> >>On Friday 26 February 2016 10:05 PM, Rhyland Klein wrote:

> >>>Did you not see warnings like this when you compiled the kernel? Did you

> >>>find a different approach than what I proposed above to deal with it?

> >>>I'd like to get this in soon so that when the max77620 drivers are all

> >>>in and using it, it should be functional.

> >>>

> >>I think the following change also crash in runtime:

> >>

> >>/***

> >>commit e60a946f05db2cac857025da6ffb72df48d3be54

> >>Author: Lee Jones <lee.jones@linaro.org>

> >>

> >>     mfd: ab8500: Provide a small example using new MFD cell MACROs

> >>

> >>***/

> >>

> >>Should we have something MFD_CELL_RES, MFD_CELL_RES_PDATA,

> >>MFD_CELL_PDATA, for more common user and not to pass the NULL here.

> >I'll have a re-think about this.

> 

> Did you get chance to look into this? Probably, I need to send my

> mfd series once this get fixed before that series applied.


Nothing is going to happen until v4.6 now.  It's too late in the
release cycle to be making such a significant addition, and I'd like
the change to sit in -next for a good while before going in.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Lee Jones March 16, 2016, 8:42 a.m. UTC | #3
On Fri, 11 Mar 2016, Laxman Dewangan wrote:

> 

> On Friday 11 March 2016 02:09 PM, Lee Jones wrote:

> >On Wed, 09 Mar 2016, Laxman Dewangan wrote:

> >>On Wednesday 02 March 2016 06:38 PM, Lee Jones wrote:

> >>>On Mon, 29 Feb 2016, Laxman Dewangan wrote:

> >>>

> >>>>On Friday 26 February 2016 10:05 PM, Rhyland Klein wrote:

> >>>>>Did you not see warnings like this when you compiled the kernel? Did you

> >>>>>find a different approach than what I proposed above to deal with it?

> >>>>>I'd like to get this in soon so that when the max77620 drivers are all

> >>>>>in and using it, it should be functional.

> >>>>>

> >>>>I think the following change also crash in runtime:

> >>>>

> >>>>/***

> >>>>commit e60a946f05db2cac857025da6ffb72df48d3be54

> >>>>Author: Lee Jones <lee.jones@linaro.org>

> >>>>

> >>>>     mfd: ab8500: Provide a small example using new MFD cell MACROs

> >>>>

> >>>>***/

> >>>>

> >>>>Should we have something MFD_CELL_RES, MFD_CELL_RES_PDATA,

> >>>>MFD_CELL_PDATA, for more common user and not to pass the NULL here.

> >>>I'll have a re-think about this.

> >>Did you get chance to look into this? Probably, I need to send my

> >>mfd series once this get fixed before that series applied.

> >Nothing is going to happen until v4.6 now.  It's too late in the

> >release cycle to be making such a significant addition, and I'd like

> >the change to sit in -next for a good while before going in.

> >

> OK, so can I use the local initializations in my max77620 patches

> and resend?

> Then later we can have cleanups for part only?

> 

> This is because if we get in next release then there is some other

> sub modules of the max77620 like clocks, watchdog, power etc which

> can go on their subsystem if common header is available.

> 

> Sorry if I am asking too much..


For quick accptance, just submit using the normal un-MACRO'ed
structure.

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

Patch

diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index 1a5a87f..8440f42 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -16,7 +16,7 @@ 
 
 #include <linux/platform_device.h>
 
-#define MFD_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#define MFD_ARRAY_SIZE(arr) (arr ? (sizeof(arr) / sizeof((arr)[0])) : 0)
 
 #define MFD_CELL_ALL(_name, _res, _pdata, _id, _compat, _match)                \
        {                                                               \