From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1427319AbcBSIuZ (ORCPT ); Fri, 19 Feb 2016 03:50:25 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:33773 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754311AbcBSIuX (ORCPT ); Fri, 19 Feb 2016 03:50:23 -0500 Date: Fri, 19 Feb 2016 08:50:19 +0000 From: Lee Jones To: Rhyland Klein Cc: linux-kernel@vger.kernel.org, Laxman Dewangan Subject: Re: [PATCH] mfd: Fix MACRO for commonly declared MFD cell attributes Message-ID: <20160219085019.GA3410@x1> References: <1455821558-28493-1-git-send-email-rklein@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1455821558-28493-1-git-send-email-rklein@nvidia.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > cc: Laxman Dewangan > Signed-off-by: Rhyland Klein > --- > 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? 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 -#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) \ { \ -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog