Re: [PATCH 2.6.20] ixgb: Use ARRAY_SIZE macro when appropriate

Auke Kok
2007-02-06T16:48:10Z

Ahmed S. Darwish wrote:
> On Mon, Feb 05, 2007 at 12:31:26PM -0800, Auke Kok wrote:
>> Alexey Dobriyan wrote:
>>> On Mon, Feb 05, 2007 at 06:59:33PM +0200, Ahmed S. Darwish wrote:
>>>> A patch to use ARRAY_SIZE macro already defined in kernel.h.
>>> Remove it and use ARRAY_SIZE instead.
>>>
>>>> --- a/drivers/net/ixgb/ixgb_param.c
>>>> +++ b/drivers/net/ixgb/ixgb_param.c
>>>> @@ -245,7 +245,7 @@ ixgb_validate_option(int *value, struct ixgb_option
>>>> *opt)
>>>> return -1;
>>>> }
>>>>
>>>> -#define LIST_LEN(l) (sizeof(l) / sizeof(l[0]))
>>>> +#define LIST_LEN(l) ARRAY_SIZE(l)
>> yes, well spotted. Please change line 338 in this file to read:
>>
>> .arg = { .l = { .nr = ARRAY_SIZE(fc_list),
>>
>> instead, so you can remove the LIST_LEN macro completely.
>
> Thanks, Here's the new patch.
>
> Use ARRAY_SIZE macro when appropriate.
>
> Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>

Acked-by: Auke Kok <auke-jan.h.kok@intel.com>

Cheers,

Auke

> ---
> diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
> index b27442a..c38ce73 100644
> --- a/drivers/net/ixgb/ixgb_param.c
> +++ b/drivers/net/ixgb/ixgb_param.c
> @@ -245,8 +245,6 @@ ixgb_validate_option(int *value, struct ixgb_option *opt)
> return -1;
> }
>
> -#define LIST_LEN(l) (sizeof(l) / sizeof(l[0]))
> -
> /**
> * ixgb_check_options - Range Checking for Command Line Parameters
> * @adapter: board private structure
> @@ -335,7 +333,7 @@ ixgb_check_options(struct ixgb_adapter *adapter)
> .name = "Flow Control",
> .err = "reading default settings from EEPROM",
> .def = ixgb_fc_tx_pause,
> - .arg = { .l = { .nr = LIST_LEN(fc_list),
> + .arg = { .l = { .nr = ARRAY_SIZE(fc_list),
> .p = fc_list }}
> };
>
>