From 2ee6779a64922af755a35ce70f85f2d67b488557 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Wed, 1 Oct 2008 12:52:52 +0000 Subject: The ARRAY_SIZE macro is convenient, yet mostly unused. Switch lots of code to use it. That makes the code more readable and also less error-prone. Abuild tested. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3624 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/superio/winbond/w83627ehg/superio.c | 5 +++-- src/superio/winbond/w83627hf/superio.c | 5 +++-- src/superio/winbond/w83627thf/superio.c | 3 ++- src/superio/winbond/w83977f/superio.c | 3 ++- src/superio/winbond/w83977tf/superio.c | 3 ++- 5 files changed, 12 insertions(+), 7 deletions(-) (limited to 'src/superio/winbond') diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c index 019f510358..d12bb67be3 100644 --- a/src/superio/winbond/w83627ehg/superio.c +++ b/src/superio/winbond/w83627ehg/superio.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "chip.h" #include "w83627ehg.h" @@ -93,7 +94,7 @@ static void init_hwm(unsigned long base) 0x48, 0x7f, 0x2a, /* Set SMBus base to 0x54 >> 1. */ }; - for(i = 0; i < sizeof(hwm_reg_values)/sizeof(hwm_reg_values[0]); i += 3) { + for(i = 0; i < ARRAY_SIZE(hwm_reg_values); i += 3) { reg = hwm_reg_values[i]; value = pnp_read_index(base, reg); value &= 0xff & (~(hwm_reg_values[i + 1])); @@ -200,7 +201,7 @@ static struct pnp_info pnp_dev_info[] = { static void enable_dev(struct device *dev) { pnp_enable_devices(dev, &ops, - sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info); + ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } struct chip_operations superio_winbond_w83627ehg_ops = { diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index 93c5f6dac2..5f26768adf 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "chip.h" #include "w83627hf.h" @@ -83,7 +84,7 @@ static void init_hwm(unsigned long base) }; - for(i = 0; i< sizeof(hwm_reg_values)/sizeof(hwm_reg_values[0]); i+=3 ) { + for(i = 0; i< ARRAY_SIZE(hwm_reg_values); i+=3 ) { reg = hwm_reg_values[i]; value = pnp_read_index(base, reg); value &= 0xff & hwm_reg_values[i+1]; @@ -189,7 +190,7 @@ static struct pnp_info pnp_dev_info[] = { static void enable_dev(struct device *dev) { pnp_enable_devices(dev, &ops, - sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info); + ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } struct chip_operations superio_winbond_w83627hf_ops = { diff --git a/src/superio/winbond/w83627thf/superio.c b/src/superio/winbond/w83627thf/superio.c index 6b08f8746c..28fd72f6df 100644 --- a/src/superio/winbond/w83627thf/superio.c +++ b/src/superio/winbond/w83627thf/superio.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "chip.h" #include "w83627thf.h" @@ -101,7 +102,7 @@ static struct pnp_info pnp_dev_info[] = { static void enable_dev(device_t dev) { pnp_enable_devices(dev, &ops, - sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info); + ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } struct chip_operations superio_winbond_w83627thf_ops = { diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c index 417fee8058..64cdc5da1a 100644 --- a/src/superio/winbond/w83977f/superio.c +++ b/src/superio/winbond/w83977f/superio.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "chip.h" #include "w83977f.h" @@ -109,7 +110,7 @@ static struct pnp_info pnp_dev_info[] = { static void enable_dev(device_t dev) { pnp_enable_devices(dev, &ops, - sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info); + ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } struct chip_operations superio_winbond_w83977f_ops = { diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c index e7d155a701..fca98ca59e 100644 --- a/src/superio/winbond/w83977tf/superio.c +++ b/src/superio/winbond/w83977tf/superio.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "chip.h" #include "w83977tf.h" @@ -105,7 +106,7 @@ static struct pnp_info pnp_dev_info[] = { static void enable_dev(device_t dev) { pnp_enable_devices(dev, &ops, - sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info); + ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } struct chip_operations superio_winbond_w83977tf_ops = { -- cgit v1.2.3