[SCSI] drivers/scsi: Use ARRAY_SIZE macro

Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove
duplicates of the macro.

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

47 files changed, 167 insertions, 200 deletions

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 37a58c6dad29..17dbd4ac8692 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -405,7 +405,7 @@ static int tw_decode_sense(TW_Device_Extension *tw_dev, int request_id, int fill
         /* Attempt to return intelligent sense information */
         if (fill_sense) {
                 if ((command->status == 0xc7) || (command->status == 0xcb)) {
-                        for (i=0;i<(sizeof(tw_sense_table)/sizeof(tw_sense_table[0]));i++) {
+                        for (i = 0; i < ARRAY_SIZE(tw_sense_table); i++) {
                                 if (command->flags == tw_sense_table[i][0]) {
 
                                         /* Valid bit and 'current errors' */
@@ -625,7 +625,7 @@ static int tw_aen_complete(TW_Device_Extension *tw_dev, int request_id)
         if (aen == 0x0ff) {
                 printk(KERN_WARNING "3w-xxxx: scsi%d: AEN: INFO: AEN queue overflow.\n", tw_dev->host->host_no);
         } else {
-                table_max = sizeof(tw_aen_string)/sizeof(char *);
+                table_max = ARRAY_SIZE(tw_aen_string);
                 if ((aen & 0x0ff) < table_max) {
                         if ((tw_aen_string[aen & 0xff][strlen(tw_aen_string[aen & 0xff])-1]) == '#') {
                                 printk(KERN_WARNING "3w-xxxx: scsi%d: AEN: %s%d.\n", tw_dev->host->host_no, tw_aen_string[aen & 0xff], aen >> 8);
@@ -786,7 +786,7 @@ static int tw_aen_drain_queue(TW_Device_Extension *tw_dev)
                                         if (aen == 0x0ff) {
                                                 printk(KERN_WARNING "3w-xxxx: AEN: INFO: AEN queue overflow.\n");
                                         } else {
-                                                table_max = sizeof(tw_aen_string)/sizeof(char *);
+                                                table_max = ARRAY_SIZE(tw_aen_string);
                                                 if ((aen & 0x0ff) < table_max) {
                                                         if ((tw_aen_string[aen & 0xff][strlen(tw_aen_string[aen & 0xff])-1]) == '#') {
                                                                 printk(KERN_WARNING "3w-xxxx: AEN: %s%d.\n", tw_aen_string[aen & 0xff], aen >> 8);
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index b767918b9a98..4958c3b93c30 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -316,7 +316,7 @@ NCR_700_detect(struct scsi_host_template *tpnt,
         BUG_ON(!dma_is_consistent(pScript) && L1_CACHE_BYTES < dma_get_cache_alignment());
         hostdata->slots = (struct NCR_700_command_slot *)(memory + SLOTS_OFFSET);
         hostdata->dev = dev;
-                
+
         pSlots = pScript + SLOTS_OFFSET;
 
         /* Fill in the missing routines from the host template */
@@ -332,19 +332,18 @@ NCR_700_detect(struct scsi_host_template *tpnt,
         tpnt->slave_destroy = NCR_700_slave_destroy;
         tpnt->change_queue_depth = NCR_700_change_queue_depth;
         tpnt->change_queue_type = NCR_700_change_queue_type;
-        
+
         if(tpnt->name == NULL)
                 tpnt->name = "53c700";
         if(tpnt->proc_name == NULL)
                 tpnt->proc_name = "53c700";
-        
 
         host = scsi_host_alloc(tpnt, 4);
         if (!host)
                 return NULL;
         memset(hostdata->slots, 0, sizeof(struct NCR_700_command_slot)
                * NCR_700_COMMAND_SLOTS_PER_HOST);
-        for(j = 0; j < NCR_700_COMMAND_SLOTS_PER_HOST; j++) {
+        for (j = 0; j < NCR_700_COMMAND_SLOTS_PER_HOST; j++) {
                 dma_addr_t offset = (dma_addr_t)((unsigned long)&hostdata->slots[j].SG[0]
                                           - (unsigned long)&hostdata->slots[0].SG[0]);
                 hostdata->slots[j].pSG = (struct NCR_700_SG_List *)((unsigned long)(pSlots + offset));
@@ -355,14 +354,12 @@ NCR_700_detect(struct scsi_host_template *tpnt,
                 hostdata->slots[j].state = NCR_700_SLOT_FREE;
         }
 
-        for(j = 0; j < sizeof(SCRIPT)/sizeof(SCRIPT[0]); j++) {
+        for (j = 0; j < ARRAY_SIZE(SCRIPT); j++)
                 script[j] = bS_to_host(SCRIPT[j]);
-        }
 
         /* adjust all labels to be bus physical */
-        for(j = 0; j < PATCHES; j++) {
+        for (j = 0; j < PATCHES; j++)
                 script[LABELPATCHES[j]] = bS_to_host(pScript + SCRIPT[LABELPATCHES[j]]);
-        }
         /* now patch up fixed addresses. */
         script_patch_32(script, MessageLocation,
                         pScript + MSGOUT_OFFSET);
@@ -385,17 +382,17 @@ NCR_700_detect(struct scsi_host_template *tpnt,
         host->hostdata[0] = (unsigned long)hostdata;
         /* kick the chip */
         NCR_700_writeb(0xff, host, CTEST9_REG);
-        if(hostdata->chip710) 
+        if (hostdata->chip710)
                 hostdata->rev = (NCR_700_readb(host, CTEST8_REG)>>4) & 0x0f;
         else
                 hostdata->rev = (NCR_700_readb(host, CTEST7_REG)>>4) & 0x0f;
         hostdata->fast = (NCR_700_readb(host, CTEST9_REG) == 0);
-        if(banner == 0) {
+        if (banner == 0) {
                 printk(KERN_NOTICE "53c700: Version " NCR_700_VERSION " By James.Bottomley@HansenPartnership.com\n");
                 banner = 1;
         }
         printk(KERN_NOTICE "scsi%d: %s rev %d %s\n", host->host_no,
-               hostdata->chip710 ? "53c710" : 
+               hostdata->chip710 ? "53c710" :
                (hostdata->fast ? "53c700-66" : "53c700"),
                hostdata->rev, hostdata->differential ?
                "(Differential)" : "");
diff --git a/drivers/scsi/53c7xx.c b/drivers/scsi/53c7xx.c
index cfc991271cc8..765769a629e4 100644
--- a/drivers/scsi/53c7xx.c
+++ b/drivers/scsi/53c7xx.c
@@ -361,7 +361,7 @@ int CmdPageStart = (0 - Ent_dsa_zero - sizeof(struct NCR53c7x0_cmd)) & 0xff;
 static char *setup_strings[] =
         {"","","","","","","",""};
 
-#define MAX_SETUP_STRINGS (sizeof(setup_strings) / sizeof(char *))
+#define MAX_SETUP_STRINGS ARRAY_SIZE(setup_strings)
 #define SETUP_BUFFER_SIZE 200
 static char setup_buffer[SETUP_BUFFER_SIZE];
 static char setup_used[MAX_SETUP_STRINGS];
@@ -2190,15 +2190,15 @@ static const struct {
  */
 
 
-static void 
+static void
 synchronous (struct Scsi_Host *host, int target, char *msg) {
     struct NCR53c7x0_hostdata *hostdata = (struct NCR53c7x0_hostdata *)
         host->hostdata[0];
     int desire, divisor, i, limit;
     unsigned char scntl3, sxfer;
 /* The diagnostic message fits on one line, even with max. width integers */
-    char buf[80];       
-   
+    char buf[80];
+
 /* Desired transfer clock in Hz */
     desire = 1000000000L / (msg[3] * 4);
 /* Scale the available SCSI clock by 10 so we get tenths */
@@ -2209,14 +2209,14 @@ synchronous (struct Scsi_Host *host, int target, char *msg) {
         msg[4] = 8;
 
     if (hostdata->options & OPTION_DEBUG_SDTR)
-        printk("scsi%d : optimal synchronous divisor of %d.%01d\n", 
+        printk("scsi%d : optimal synchronous divisor of %d.%01d\n",
             host->host_no, divisor / 10, divisor % 10);
 
-    limit = (sizeof(syncs) / sizeof(syncs[0]) -1);
+    limit = ARRAY_SIZE(syncs) - 1;
     for (i = 0; (i < limit) && (divisor > syncs[i].div); ++i);
 
     if (hostdata->options & OPTION_DEBUG_SDTR)
-        printk("scsi%d : selected synchronous divisor of %d.%01d\n", 
+        printk("scsi%d : selected synchronous divisor of %d.%01d\n",
             host->host_no, syncs[i].div / 10, syncs[i].div % 10);
 
     msg[3] = ((1000000000L / hostdata->scsi_clock) * syncs[i].div / 10 / 4);
diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index ae37d3ab9c4a..8472c5359023 100644
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -213,16 +213,16 @@ static void *addresses[] = {
         (void *) 0xd8000,
         (void *) 0xc8000
 };
-#define ADDRESS_COUNT (sizeof( addresses ) / sizeof( unsigned ))
+#define ADDRESS_COUNT ARRAY_SIZE(addresses)
 #endif                          /* USE_BIOS */
 
 /* possible i/o port addresses */
 static unsigned short ports[] = { 0x230, 0x330, 0x280, 0x290, 0x330, 0x340, 0x300, 0x310, 0x348, 0x350 };
-#define PORT_COUNT (sizeof( ports ) / sizeof( unsigned short ))
+#define PORT_COUNT ARRAY_SIZE(ports)
 
 /* possible interrupt channels */
 static unsigned short intrs[] = { 10, 11, 12, 15 };
-#define INTR_COUNT (sizeof( intrs ) / sizeof( unsigned short ))
+#define INTR_COUNT ARRAY_SIZE(intrs)
 
 /* signatures for NCR 53c406a based controllers */
 #if USE_BIOS
@@ -236,7 +236,7 @@ struct signature {
         {
 "Copyright (C) Acculogic, Inc.\r\n2.8M Diskette Extension Bios ver 4.04.03 03/01/1993", 61, 82},};
 
-#define SIGNATURE_COUNT (sizeof( signatures ) / sizeof( struct signature ))
+#define SIGNATURE_COUNT ARRAY_SIZE(signatures)
 #endif                          /* USE_BIOS */
 
 /* ============================================================ */
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index e4b38f896cbd..ea9e038813eb 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -641,13 +641,13 @@ static void setinqstr(struct aac_dev *dev, void *data, int tindex)
                         cp[sizeof(str->pid)] = c;
         } else {
                 struct aac_driver_ident *mp = aac_get_driver_ident(dev->cardtype);
-   
-                inqstrcpy (mp->vname, str->vid); 
+
+                inqstrcpy (mp->vname, str->vid);
                 /* last six chars reserved for vol type */
                 inqstrcpy (mp->model, str->pid);
         }
 
-        if (tindex < (sizeof(container_types)/sizeof(char *))){
+        if (tindex < ARRAY_SIZE(container_types)){
                 char *findit = str->pid;
 
                 for ( ; *findit != ' '; findit++); /* walk till we find a space */
@@ -1576,7 +1576,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
                  *      see: <vendor>.c i.e. aac.c
                  */
                 if (scmd_id(scsicmd) == host->this_id) {
-                        setinqstr(dev, (void *) (inq_data.inqd_vid), (sizeof(container_types)/sizeof(char *)));
+                        setinqstr(dev, (void *) (inq_data.inqd_vid), ARRAY_SIZE(container_types));
                         inq_data.inqd_pdt = INQD_PDT_PROC;      /* Processor device */
                         aac_internal_transfer(scsicmd, &inq_data, 0, sizeof(inq_data));
                         scsicmd->result = DID_OK << 16 | COMMAND_COMPLETE << 8 | SAM_STAT_GOOD;
@@ -2381,7 +2381,7 @@ static struct aac_srb_status_info srb_status_info[] = {
         { SRB_STATUS_SUCCESS,           "Success"},
         { SRB_STATUS_ABORTED,           "Aborted Command"},
         { SRB_STATUS_ABORT_FAILED,      "Abort Failed"},
-        { SRB_STATUS_ERROR,             "Error Event"}, 
+        { SRB_STATUS_ERROR,             "Error Event"},
         { SRB_STATUS_BUSY,              "Device Busy"},
         { SRB_STATUS_INVALID_REQUEST,   "Invalid Request"},
         { SRB_STATUS_INVALID_PATH_ID,   "Invalid Path ID"},
@@ -2400,7 +2400,7 @@ static struct aac_srb_status_info srb_status_info[] = {
         { SRB_STATUS_BAD_SRB_BLOCK_LENGTH,"Bad Srb Block Length"},
         { SRB_STATUS_REQUEST_FLUSHED,   "Request Flushed"},
         { SRB_STATUS_DELAYED_RETRY,     "Delayed Retry"},
-        { SRB_STATUS_INVALID_LUN,       "Invalid LUN"}, 
+        { SRB_STATUS_INVALID_LUN,       "Invalid LUN"},
         { SRB_STATUS_INVALID_TARGET_ID, "Invalid TARGET ID"},
         { SRB_STATUS_BAD_FUNCTION,      "Bad Function"},
         { SRB_STATUS_ERROR_RECOVERY,    "Error Recovery"},
@@ -2415,11 +2415,9 @@ char *aac_get_status_string(u32 status)
 {
         int i;
 
-        for(i=0; i < (sizeof(srb_status_info)/sizeof(struct aac_srb_status_info)); i++ ){
-                if(srb_status_info[i].status == status){
+        for (i = 0; i < ARRAY_SIZE(srb_status_info); i++)
+                if (srb_status_info[i].status == status)
                         return srb_status_info[i].str;
-                }
-        }
 
         return "Bad Status Code";
 }
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 9f75144e5247..255421de9d1a 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -535,7 +535,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
         default:
                 data_dir = DMA_NONE;
         }
-        if (user_srbcmd->sg.count > (sizeof(sg_list)/sizeof(sg_list[0]))) {
+        if (user_srbcmd->sg.count > ARRAY_SIZE(sg_list)) {
                 dprintk((KERN_DEBUG"aacraid: too many sg entries %d\n",
                   le32_to_cpu(srbcmd->sg.count)));
                 rcode = -EINVAL;
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 51bad7a1e773..86c6bd234591 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -1011,7 +1011,7 @@ static int __init do_setup(char *str)
 
         int count=setup_idx;
 
-        get_options(str, sizeof(ints)/sizeof(int), ints);
+        get_options(str, ARRAY_SIZE(ints), ints);
         aha1542_setup(str,ints);
 
         return count<setup_idx;
@@ -1072,8 +1072,7 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)
                 int slot = 0;
                 int pos = 0;
 
-                for (indx = 0; (slot !=  MCA_NOTFOUND) && 
-                             (indx < sizeof(bases)/sizeof(bases[0])); indx++) {
+                for (indx = 0; (slot != MCA_NOTFOUND) && (indx < ARRAY_SIZE(bases)); indx++) {
 
                         if (bases[indx])
                                 continue;
@@ -1083,10 +1082,9 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)
                         if (slot == MCA_NOTFOUND)
                                 break;
 
-                        
                         /* Found one */
                         pos = mca_read_stored_pos(slot, 3);
-                        
+
                         /* Decode address */
                         if (pos & 0x80) {
                                 if (pos & 0x02) {
@@ -1118,23 +1116,22 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)
                         mca_set_adapter_name(slot, "Adapter AHA-1640");
                         mca_set_adapter_procfn(slot, NULL, NULL);
                         mca_mark_as_used(slot);
-                        
+
                         /* Go on */
                         slot++;
                 }
-                
+
         }
 #endif
 
         /*
          *      Hunt for ISA Plug'n'Pray Adaptecs (AHA1535)
          */
-         
+
         if(isapnp)
         {
                 struct pnp_dev *pdev = NULL;
-                for(indx = 0; indx <sizeof(bases)/sizeof(bases[0]);indx++)
-                {
+                for(indx = 0; indx < ARRAY_SIZE(bases); indx++) {
                         if(bases[indx])
                                 continue;
                         pdev = pnp_find_dev(NULL, ISAPNP_VENDOR('A', 'D', 'P'), 
@@ -1144,29 +1141,29 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)
                         /*
                          *      Activate the PnP card
                          */
-                         
+
                         if(pnp_device_attach(pdev)<0)
                                 continue;
-                        
+
                         if(pnp_activate_dev(pdev)<0) {
                                 pnp_device_detach(pdev);
                                 continue;
                         }
-                        
+
                         if(!pnp_port_valid(pdev, 0)) {
                                 pnp_device_detach(pdev);
                                 continue;
                         }
-                                
+
                         bases[indx] = pnp_port_start(pdev, 0);
-                        
+
                         /* The card can be queried for its DMA, we have 
                            the DMA set up that is enough */
-                           
+
                         printk(KERN_INFO "ISAPnP found an AHA1535 at I/O 0x%03X\n", bases[indx]);
                 }
         }
-        for (indx = 0; indx < sizeof(bases) / sizeof(bases[0]); indx++)
+        for (indx = 0; indx < ARRAY_SIZE(bases); indx++)
                 if (bases[indx] != 0 && request_region(bases[indx], 4, "aha1542")) {
                         shpnt = scsi_register(tpnt,
                                         sizeof(struct aha1542_hostdata));
diff --git a/drivers/scsi/aic7xxx/aic7770.c b/drivers/scsi/aic7xxx/aic7770.c
index 527efd36f5c1..c4d17231c828 100644
--- a/drivers/scsi/aic7xxx/aic7770.c
+++ b/drivers/scsi/aic7xxx/aic7770.c
@@ -107,7 +107,7 @@ struct aic7770_identity aic7770_ident_table[] =
                 ahc_aic7770_EISA_setup
         }
 };
-const int ahc_num_aic7770_devs = NUM_ELEMENTS(aic7770_ident_table);
+const int ahc_num_aic7770_devs = ARRAY_SIZE(aic7770_ident_table);
 
 struct aic7770_identity *
 aic7770_find_device(uint32_t id)
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index bb5166da4358..eb7745692682 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -68,8 +68,6 @@ struct scb_platform_data;
 #define FALSE 0
 #endif
 
-#define NUM_ELEMENTS(array) (sizeof(array) / sizeof(*array))
-
 #define ALL_CHANNELS '\0'
 #define ALL_TARGETS_MASK 0xFFFF
 #define INITIATOR_WILDCARD      (~0)
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index e14244aa69d7..801fc81d0b20 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -59,7 +59,7 @@ char *ahd_chip_names[] =
         "aic7902",
         "aic7901A"
 };
-static const u_int num_chip_names = NUM_ELEMENTS(ahd_chip_names);
+static const u_int num_chip_names = ARRAY_SIZE(ahd_chip_names);
 
 /*
  * Hardware error codes.
@@ -77,7 +77,7 @@ static struct ahd_hard_error_entry ahd_hard_errors[] = {
         { MPARERR,      "Scratch or SCB Memory Parity Error" },
         { CIOPARERR,    "CIOBUS Parity Error" },
 };
-static const u_int num_errors = NUM_ELEMENTS(ahd_hard_errors);
+static const u_int num_errors = ARRAY_SIZE(ahd_hard_errors);
 
 static struct ahd_phase_table_entry ahd_phase_table[] =
 {
@@ -97,7 +97,7 @@ static struct ahd_phase_table_entry ahd_phase_table[] =
  * In most cases we only wish to itterate over real phases, so
  * exclude the last element from the count.
  */
-static const u_int num_phases = NUM_ELEMENTS(ahd_phase_table) - 1;
+static const u_int num_phases = ARRAY_SIZE(ahd_phase_table) - 1;
 
 /* Our Sequencer Program */
 #include "aic79xx_seq.h"
@@ -7259,7 +7259,7 @@ ahd_qinfifo_count(struct ahd_softc *ahd)
                 return (wrap_qinfifonext - wrap_qinpos);
         else
                 return (wrap_qinfifonext
-                      + NUM_ELEMENTS(ahd->qinfifo) - wrap_qinpos);
+                      + ARRAY_SIZE(ahd->qinfifo) - wrap_qinpos);
 }
 
 void
@@ -8619,7 +8619,7 @@ ahd_check_patch(struct ahd_softc *ahd, struct patch **start_patch,
         struct  patch *last_patch;
         u_int   num_patches;
 
-        num_patches = sizeof(patches)/sizeof(struct patch);
+        num_patches = ARRAY_SIZE(patches);
         last_patch = &patches[num_patches];
         cur_patch = *start_patch;
 
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 66e4a47bb9ee..e0ccdf362200 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -916,7 +916,7 @@ ahd_linux_setup_iocell_info(u_long index, int instance, int targ, int32_t value)
 {
 
         if ((instance >= 0)
-         && (instance < NUM_ELEMENTS(aic79xx_iocell_info))) {
+         && (instance < ARRAY_SIZE(aic79xx_iocell_info))) {
                 uint8_t *iocell_info;
 
                 iocell_info = (uint8_t*)&aic79xx_iocell_info[instance];
@@ -934,7 +934,7 @@ ahd_linux_setup_tag_info_global(char *p)
         tags = simple_strtoul(p + 1, NULL, 0) & 0xff;
         printf("Setting Global Tags= %d\n", tags);
 
-        for (i = 0; i < NUM_ELEMENTS(aic79xx_tag_info); i++) {
+        for (i = 0; i < ARRAY_SIZE(aic79xx_tag_info); i++) {
                 for (j = 0; j < AHD_NUM_TARGETS; j++) {
                         aic79xx_tag_info[i].tag_commands[j] = tags;
                 }
@@ -946,7 +946,7 @@ ahd_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)
 {
 
         if ((instance >= 0) && (targ >= 0)
-         && (instance < NUM_ELEMENTS(aic79xx_tag_info))
+         && (instance < ARRAY_SIZE(aic79xx_tag_info))
          && (targ < AHD_NUM_TARGETS)) {
                 aic79xx_tag_info[instance].tag_commands[targ] = value & 0x1FF;
                 if (bootverbose)
@@ -1072,21 +1072,21 @@ aic79xx_setup(char *s)
         end = strchr(s, '\0');
 
         /*
-         * XXX ia64 gcc isn't smart enough to know that NUM_ELEMENTS
+         * XXX ia64 gcc isn't smart enough to know that ARRAY_SIZE
          * will never be 0 in this case.
-         */      
-        n = 0;  
+         */
+        n = 0;
 
         while ((p = strsep(&s, ",.")) != NULL) {
                 if (*p == '\0')
                         continue;
-                for (i = 0; i < NUM_ELEMENTS(options); i++) {
+                for (i = 0; i < ARRAY_SIZE(options); i++) {
 
                         n = strlen(options[i].name);
                         if (strncmp(options[i].name, p, n) == 0)
                                 break;
                 }
-                if (i == NUM_ELEMENTS(options))
+                if (i == ARRAY_SIZE(options))
                         continue;
 
                 if (strncmp(p, "global_tag_depth", n) == 0) {
@@ -1294,7 +1294,7 @@ ahd_platform_init(struct ahd_softc *ahd)
         /*
          * Lookup and commit any modified IO Cell options.
          */
-        if (ahd->unit < NUM_ELEMENTS(aic79xx_iocell_info)) {
+        if (ahd->unit < ARRAY_SIZE(aic79xx_iocell_info)) {
                 struct ahd_linux_iocell_opts *iocell_opts;
 
                 iocell_opts = &aic79xx_iocell_info[ahd->unit];
@@ -1426,7 +1426,7 @@ ahd_linux_user_tagdepth(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
 
         tags = 0;
         if ((ahd->user_discenable & devinfo->target_mask) != 0) {
-                if (ahd->unit >= NUM_ELEMENTS(aic79xx_tag_info)) {
+                if (ahd->unit >= ARRAY_SIZE(aic79xx_tag_info)) {
 
                         if (warned_user == 0) {
                                 printf(KERN_WARNING
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 757242e522c2..14850f31aafa 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -201,7 +201,7 @@ struct ahd_pci_identity ahd_pci_ident_table [] =
         }
 };
 
-const u_int ahd_num_pci_devs = NUM_ELEMENTS(ahd_pci_ident_table);
+const u_int ahd_num_pci_devs = ARRAY_SIZE(ahd_pci_ident_table);
                 
 #define DEVCONFIG               0x40
 #define         PCIXINITPAT     0x0000E000ul
diff --git a/drivers/scsi/aic7xxx/aic79xx_proc.c b/drivers/scsi/aic7xxx/aic79xx_proc.c
index 39a27840fce6..24fd59a230bf 100644
--- a/drivers/scsi/aic7xxx/aic79xx_proc.c
+++ b/drivers/scsi/aic7xxx/aic79xx_proc.c
@@ -76,11 +76,9 @@ static u_int
 ahd_calc_syncsrate(u_int period_factor)
 {
         int i;
-        int num_syncrates;
 
-        num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
         /* See if the period is in the "exception" table */
-        for (i = 0; i < num_syncrates; i++) {
+        for (i = 0; i < ARRAY_SIZE(scsi_syncrates); i++) {
 
                 if (period_factor == scsi_syncrates[i].period_factor) {
                         /* Period in kHz */
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 91d294c6334e..e24e6067401b 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -69,8 +69,6 @@ struct seeprom_descriptor;
 #define FALSE 0
 #endif
 
-#define NUM_ELEMENTS(array) (sizeof(array) / sizeof(*array))
-
 #define ALL_CHANNELS '\0'
 #define ALL_TARGETS_MASK 0xFFFF
 #define INITIATOR_WILDCARD      (~0)
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 50a3dd047cfe..93e4e40944b6 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -68,7 +68,7 @@ char *ahc_chip_names[] =
         "aic7892",
         "aic7899"
 };
-static const u_int num_chip_names = NUM_ELEMENTS(ahc_chip_names);
+static const u_int num_chip_names = ARRAY_SIZE(ahc_chip_names);
 
 /*
  * Hardware error codes.
@@ -88,7 +88,7 @@ static struct ahc_hard_error_entry ahc_hard_errors[] = {
         { PCIERRSTAT,   "PCI Error detected" },
         { CIOPARERR,    "CIOBUS Parity Error" },
 };
-static const u_int num_errors = NUM_ELEMENTS(ahc_hard_errors);
+static const u_int num_errors = ARRAY_SIZE(ahc_hard_errors);
 
 static struct ahc_phase_table_entry ahc_phase_table[] =
 {
@@ -108,7 +108,7 @@ static struct ahc_phase_table_entry ahc_phase_table[] =
  * In most cases we only wish to itterate over real phases, so
  * exclude the last element from the count.
  */
-static const u_int num_phases = NUM_ELEMENTS(ahc_phase_table) - 1;
+static const u_int num_phases = ARRAY_SIZE(ahc_phase_table) - 1;
 
 /*
  * Valid SCSIRATE values.  (p. 3-17)
@@ -6367,7 +6367,7 @@ ahc_check_patch(struct ahc_softc *ahc, struct patch **start_patch,
         struct  patch *last_patch;
         u_int   num_patches;
 
-        num_patches = sizeof(patches)/sizeof(struct patch);
+        num_patches = ARRAY_SIZE(patches);
         last_patch = &patches[num_patches];
         cur_patch = *start_patch;
 
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 2c801672d8bb..eadfefdd8d7a 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -886,7 +886,7 @@ ahc_linux_setup_tag_info_global(char *p)
         tags = simple_strtoul(p + 1, NULL, 0) & 0xff;
         printf("Setting Global Tags= %d\n", tags);
 
-        for (i = 0; i < NUM_ELEMENTS(aic7xxx_tag_info); i++) {
+        for (i = 0; i < ARRAY_SIZE(aic7xxx_tag_info); i++) {
                 for (j = 0; j < AHC_NUM_TARGETS; j++) {
                         aic7xxx_tag_info[i].tag_commands[j] = tags;
                 }
@@ -898,7 +898,7 @@ ahc_linux_setup_tag_info(u_long arg, int instance, int targ, int32_t value)
 {
 
         if ((instance >= 0) && (targ >= 0)
-         && (instance < NUM_ELEMENTS(aic7xxx_tag_info))
+         && (instance < ARRAY_SIZE(aic7xxx_tag_info))
          && (targ < AHC_NUM_TARGETS)) {
                 aic7xxx_tag_info[instance].tag_commands[targ] = value & 0xff;
                 if (bootverbose)
@@ -1020,7 +1020,7 @@ aic7xxx_setup(char *s)
         end = strchr(s, '\0');
 
         /*
-         * XXX ia64 gcc isn't smart enough to know that NUM_ELEMENTS
+         * XXX ia64 gcc isn't smart enough to know that ARRAY_SIZE
          * will never be 0 in this case.
          */
         n = 0;
@@ -1028,13 +1028,13 @@ aic7xxx_setup(char *s)
         while ((p = strsep(&s, ",.")) != NULL) {
                 if (*p == '\0')
                         continue;
-                for (i = 0; i < NUM_ELEMENTS(options); i++) {
+                for (i = 0; i < ARRAY_SIZE(options); i++) {
 
                         n = strlen(options[i].name);
                         if (strncmp(options[i].name, p, n) == 0)
                                 break;
                 }
-                if (i == NUM_ELEMENTS(options))
+                if (i == ARRAY_SIZE(options))
                         continue;
 
                 if (strncmp(p, "global_tag_depth", n) == 0) {
@@ -1360,7 +1360,7 @@ ahc_linux_user_tagdepth(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
 
         tags = 0;
         if ((ahc->user_discenable & devinfo->target_mask) != 0) {
-                if (ahc->unit >= NUM_ELEMENTS(aic7xxx_tag_info)) {
+                if (ahc->unit >= ARRAY_SIZE(aic7xxx_tag_info)) {
                         if (warned_user == 0) {
 
                                 printf(KERN_WARNING
diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c
index 5f586140e057..b1156fbd4a1a 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -553,7 +553,7 @@ struct ahc_pci_identity ahc_pci_ident_table [] =
         }
 };
 
-const u_int ahc_num_pci_devs = NUM_ELEMENTS(ahc_pci_ident_table);
+const u_int ahc_num_pci_devs = ARRAY_SIZE(ahc_pci_ident_table);
                 
 #define AHC_394X_SLOT_CHANNEL_A 4
 #define AHC_394X_SLOT_CHANNEL_B 5
diff --git a/drivers/scsi/aic7xxx/aic7xxx_proc.c b/drivers/scsi/aic7xxx/aic7xxx_proc.c
index 04a3506cf340..5914b4aa4a8f 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_proc.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_proc.c
@@ -77,11 +77,9 @@ static u_int
 ahc_calc_syncsrate(u_int period_factor)
 {
         int i;
-        int num_syncrates;
 
-        num_syncrates = sizeof(scsi_syncrates) / sizeof(scsi_syncrates[0]);
         /* See if the period is in the "exception" table */
-        for (i = 0; i < num_syncrates; i++) {
+        for (i = 0; i < ARRAY_SIZE(scsi_syncrates); i++) {
 
                 if (period_factor == scsi_syncrates[i].period_factor) {
                         /* Period in kHz */
diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index 770f1647e4d6..5dba1c63122e 100644
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -1565,7 +1565,7 @@ aic7xxx_check_patch(struct aic7xxx_host *p,
   struct sequencer_patch *last_patch;
   int num_patches;
 
-  num_patches = sizeof(sequencer_patches)/sizeof(struct sequencer_patch);
+  num_patches = ARRAY_SIZE(sequencer_patches);
   last_patch = &sequencer_patches[num_patches];
   cur_patch = *start_patch;
 
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 30a335349cee..e24835b38b54 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -114,8 +114,7 @@ static const struct value_name_pair maint_in_arr[] = {
         {0xd, "Report supported task management functions"},
         {0xe, "Report priority"},
 };
-#define MAINT_IN_SZ \
-        (int)(sizeof(maint_in_arr) / sizeof(maint_in_arr[0]))
+#define MAINT_IN_SZ ARRAY_SIZE(maint_in_arr)
 
 static const struct value_name_pair maint_out_arr[] = {
         {0x6, "Set device identifier"},
@@ -123,34 +122,29 @@ static const struct value_name_pair maint_out_arr[] = {
         {0xb, "Change aliases"},
         {0xe, "Set priority"},
 };
-#define MAINT_OUT_SZ \
-        (int)(sizeof(maint_out_arr) / sizeof(maint_out_arr[0]))
+#define MAINT_OUT_SZ ARRAY_SIZE(maint_out_arr)
 
 static const struct value_name_pair serv_in12_arr[] = {
         {0x1, "Read media serial number"},
 };
-#define SERV_IN12_SZ  \
-        (int)(sizeof(serv_in12_arr) / sizeof(serv_in12_arr[0]))
+#define SERV_IN12_SZ ARRAY_SIZE(serv_in12_arr)
 
 static const struct value_name_pair serv_out12_arr[] = {
         {-1, "dummy entry"},
 };
-#define SERV_OUT12_SZ \
-        (int)(sizeof(serv_out12_arr) / sizeof(serv_in12_arr[0]))
+#define SERV_OUT12_SZ ARRAY_SIZE(serv_out12_arr)
 
 static const struct value_name_pair serv_in16_arr[] = {
         {0x10, "Read capacity(16)"},
         {0x11, "Read long(16)"},
 };
-#define SERV_IN16_SZ  \
-        (int)(sizeof(serv_in16_arr) / sizeof(serv_in16_arr[0]))
+#define SERV_IN16_SZ ARRAY_SIZE(serv_in16_arr)
 
 static const struct value_name_pair serv_out16_arr[] = {
         {0x11, "Write long(16)"},
         {0x1f, "Notify data transfer device(16)"},
 };
-#define SERV_OUT16_SZ \
-        (int)(sizeof(serv_out16_arr) / sizeof(serv_in16_arr[0]))
+#define SERV_OUT16_SZ ARRAY_SIZE(serv_out16_arr)
 
 static const struct value_name_pair variable_length_arr[] = {
         {0x1, "Rebuild(32)"},
@@ -190,8 +184,7 @@ static const struct value_name_pair variable_length_arr[] = {
         {0x8f7e, "Perform SCSI command (osd)"},
         {0x8f7f, "Perform task management function (osd)"},
 };
-#define VARIABLE_LENGTH_SZ \
-        (int)(sizeof(variable_length_arr) / sizeof(variable_length_arr[0]))
+#define VARIABLE_LENGTH_SZ ARRAY_SIZE(variable_length_arr)
 
 static const char * get_sa_name(const struct value_name_pair * arr,
                                 int arr_sz, int service_action)
@@ -1290,10 +1283,10 @@ EXPORT_SYMBOL(scsi_print_command);
 #ifdef CONFIG_SCSI_CONSTANTS
 
 static const char * const hostbyte_table[]={
-"DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT", "DID_BAD_TARGET", 
+"DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT", "DID_BAD_TARGET",
 "DID_ABORT", "DID_PARITY", "DID_ERROR", "DID_RESET", "DID_BAD_INTR",
 "DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY"};
-#define NUM_HOSTBYTE_STRS (sizeof(hostbyte_table) / sizeof(const char *))
+#define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table)
 
 void scsi_print_hostbyte(int scsiresult)
 {
@@ -1303,7 +1296,7 @@ void scsi_print_hostbyte(int scsiresult)
         if (hb < NUM_HOSTBYTE_STRS)
                 printk("(%s) ", hostbyte_table[hb]);
         else
-                printk("is invalid "); 
+                printk("is invalid ");
 }
 #else
 void scsi_print_hostbyte(int scsiresult)
@@ -1315,14 +1308,14 @@ void scsi_print_hostbyte(int scsiresult)
 #ifdef CONFIG_SCSI_CONSTANTS
 
 static const char * const driverbyte_table[]={
-"DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT",  "DRIVER_MEDIA", "DRIVER_ERROR", 
+"DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT",  "DRIVER_MEDIA", "DRIVER_ERROR",
 "DRIVER_INVALID", "DRIVER_TIMEOUT", "DRIVER_HARD", "DRIVER_SENSE"};
-#define NUM_DRIVERBYTE_STRS (sizeof(driverbyte_table) / sizeof(const char *))
+#define NUM_DRIVERBYTE_STRS ARRAY_SIZE(driverbyte_table)
 
 static const char * const driversuggest_table[]={"SUGGEST_OK",
 "SUGGEST_RETRY", "SUGGEST_ABORT", "SUGGEST_REMAP", "SUGGEST_DIE",
 "SUGGEST_5", "SUGGEST_6", "SUGGEST_7", "SUGGEST_SENSE"};
-#define NUM_SUGGEST_STRS (sizeof(driversuggest_table) / sizeof(const char *))
+#define NUM_SUGGEST_STRS ARRAY_SIZE(driversuggest_table)
 
 void scsi_print_driverbyte(int scsiresult)
 {
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index 310d2f488668..c5108c8c887b 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -145,35 +145,35 @@ static struct override {
 0, IRQ_AUTO}};
 #endif
 
-#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))
+#define NO_OVERRIDES ARRAY_SIZE(overrides)
 
 static struct base {
         unsigned long address;
         int noauto;
-} bases[] __initdata = { 
-        { 0xcc000, 0 }, 
-        { 0xc8000, 0 }, 
-        { 0xdc000, 0 }, 
+} bases[] __initdata = {
+        { 0xcc000, 0 },
+        { 0xc8000, 0 },
+        { 0xdc000, 0 },
         { 0xd8000, 0 }
 };
 
-#define NO_BASES (sizeof (bases) / sizeof (struct base))
+#define NO_BASES ARRAY_SIZE(bases)
 
 static const struct signature {
         const char *string;
         int offset;
-} signatures[] = { 
+} signatures[] = {
         {"DATA TECHNOLOGY CORPORATION BIOS", 0x25},
 };
 
-#define NO_SIGNATURES (sizeof (signatures) /  sizeof (struct signature))
+#define NO_SIGNATURES ARRAY_SIZE(signatures)
 
 #ifndef MODULE
 /*
  * Function : dtc_setup(char *str, int *ints)
  *
  * Purpose : LILO command line initialization of the overrides array,
- * 
+ *
  * Inputs : str - unused, ints - array of integer parameters with ints[0]
  *      equal to the number of ints.
  *
diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c
index cca485a2b438..70a1606bd580 100644
--- a/drivers/scsi/fd_mcs.c
+++ b/drivers/scsi/fd_mcs.c
@@ -279,7 +279,7 @@ static struct fd_mcs_adapters_struct fd_mcs_adapters[] = {
          2},
 };
 
-#define FD_BRDS sizeof(fd_mcs_adapters)/sizeof(struct fd_mcs_adapters_struct)
+#define FD_BRDS ARRAY_SIZE(fd_mcs_adapters)
 
 static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs);
 
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 7334244397d1..e16013f0ad6e 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -420,10 +420,10 @@ static unsigned long addresses[] = {
    0xd0000,
    0xe0000,
 };
-#define ADDRESS_COUNT (sizeof( addresses ) / sizeof( unsigned ))
-                       
+#define ADDRESS_COUNT ARRAY_SIZE(addresses)
+
 static unsigned short ports[] = { 0x140, 0x150, 0x160, 0x170 };
-#define PORT_COUNT (sizeof( ports ) / sizeof( unsigned short ))
+#define PORT_COUNT ARRAY_SIZE(ports)
 
 static unsigned short ints[] = { 3, 5, 10, 11, 12, 14, 15, 0 };
 
@@ -502,7 +502,7 @@ static struct signature {
     geometry location are verified). */
 };
 
-#define SIGNATURE_COUNT (sizeof( signatures ) / sizeof( struct signature ))
+#define SIGNATURE_COUNT ARRAY_SIZE(signatures)
 
 static void print_banner( struct Scsi_Host *shpnt )
 {
@@ -519,7 +519,7 @@ static void print_banner( struct Scsi_Host *shpnt )
 
       if (bios_minor >= 0) printk("%d", bios_minor);
       else                 printk("?.");
-   
+
       printk( " at 0x%lx using scsi id %d\n",
               bios_base, shpnt->this_id );
    }
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index e6bcfe949340..5f313c93b7a9 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -138,10 +138,9 @@ static struct override {
 [1] __initdata = { { 0,},};
 #endif
 
+#define NO_OVERRIDES ARRAY_SIZE(overrides)
 
-#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))
-
-#ifndef MODULE 
+#ifndef MODULE
 
 /**
  *      internal_setup          -       handle lilo command string override
@@ -210,7 +209,7 @@ static int __init do_NCR5380_setup(char *str)
 {
         int ints[10];
 
-        get_options(str, sizeof(ints) / sizeof(int), ints);
+        get_options(str, ARRAY_SIZE(ints), ints);
         internal_setup(BOARD_NCR5380, str, ints);
         return 1;
 }
@@ -218,7 +217,7 @@ static int __init do_NCR5380_setup(char *str)
 /**
  *      do_NCR53C400_setup              -       set up entry point
  *      @str: unused
- *      @ints: integer parameters from kernel setup code 
+ *      @ints: integer parameters from kernel setup code
  *
  *      Setup function invoked at boot to parse the ncr53c400= command
  *      line.
@@ -228,7 +227,7 @@ static int __init do_NCR53C400_setup(char *str)
 {
         int ints[10];
 
-        get_options(str, sizeof(ints) / sizeof(int), ints);
+        get_options(str, ARRAY_SIZE(ints), ints);
         internal_setup(BOARD_NCR53C400, str, ints);
         return 1;
 }
@@ -236,7 +235,7 @@ static int __init do_NCR53C400_setup(char *str)
 /**
  *      do_NCR53C400A_setup     -       set up entry point
  *      @str: unused
- *      @ints: integer parameters from kernel setup code 
+ *      @ints: integer parameters from kernel setup code
  *
  *      Setup function invoked at boot to parse the ncr53c400a= command
  *      line.
@@ -246,7 +245,7 @@ static int __init do_NCR53C400A_setup(char *str)
 {
         int ints[10];
 
-        get_options(str, sizeof(ints) / sizeof(int), ints);
+        get_options(str, ARRAY_SIZE(ints), ints);
         internal_setup(BOARD_NCR53C400A, str, ints);
         return 1;
 }
@@ -254,7 +253,7 @@ static int __init do_NCR53C400A_setup(char *str)
 /**
  *      do_DTC3181E_setup       -       set up entry point
  *      @str: unused
- *      @ints: integer parameters from kernel setup code 
+ *      @ints: integer parameters from kernel setup code
  *
  *      Setup function invoked at boot to parse the dtc3181e= command
  *      line.
@@ -264,7 +263,7 @@ static int __init do_DTC3181E_setup(char *str)
 {
         int ints[10];
 
-        get_options(str, sizeof(ints) / sizeof(int), ints);
+        get_options(str, ARRAY_SIZE(ints), ints);
         internal_setup(BOARD_DTC3181E, str, ints);
         return 1;
 }
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index e720bb017c1e..fc4d9f61cf3d 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -569,8 +569,8 @@ static struct timer_list gdth_timer;
 #endif
 
 #define PTR2USHORT(a)   (ushort)(ulong)(a)
-#define GDTOFFSOF(a,b)  (size_t)&(((a*)0)->b)   
-#define INDEX_OK(i,t)   ((i)<sizeof(t)/sizeof((t)[0]))
+#define GDTOFFSOF(a,b)  (size_t)&(((a*)0)->b)
+#define INDEX_OK(i,t)   ((i)<ARRAY_SIZE(t))
 
 #define NUMDATA(a)      ( (gdth_num_str  *)((a)->hostdata))
 #define HADATA(a)       (&((gdth_ext_str *)((a)->hostdata))->haext)
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index 24eb59e143a9..0c6dc31bb14d 100644
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -1441,7 +1441,7 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id)
         struct Scsi_Host *dev = dev_id;
 
         spin_lock_irqsave(dev->host_lock, flags);
-        
+
         shpnt = dev;            /* assign host-structure to local pointer */
         len = 0;                /* set filled text-buffer index to 0 */
         /* get the _special contents of the hostdata structure */
@@ -1456,7 +1456,7 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id)
                 /* if the integrated subsystem has been found automatically: */
                 len += sprintf(buf + len,
                                "Adapter category: integrated\n" "Chip revision level: %d\n" "Chip status: %s\n" "8 kByte NVRAM status: %s\n", ((pos[2] & 0xf0) >> 4), (pos[2] & 1) ? "enabled" : "disabled", (pos[2] & 2) ? "locked" : "accessible");
-        } else if ((speciale >= 0) && (speciale < (sizeof(subsys_list) / sizeof(struct subsys_list_struct)))) {
+        } else if ((speciale >= 0) && (speciale < ARRAY_SIZE(subsys_list))) {
                 /* if the subsystem is a slot adapter */
                 len += sprintf(buf + len, "Adapter category: slot-card\n" "ROM Segment Address: ");
                 if ((pos[2] & 0xf0) == 0xf0)
@@ -1477,16 +1477,16 @@ static int ibmmca_getinfo(char *buf, int slot, void *dev_id)
         while (len % sizeof(int) != (sizeof(int) - 1))
                 len += sprintf(buf + len, " ");
         len += sprintf(buf + len, "\n");
-        
+
         spin_unlock_irqrestore(shpnt->host_lock, flags);
-        
+
         return len;
 }
 
 int ibmmca_detect(struct scsi_host_template * scsi_template)
 {
         struct Scsi_Host *shpnt;
-        int port, id, i, j, k, list_size, slot;
+        int port, id, i, j, k, slot;
         int devices_on_irq_11 = 0;
         int devices_on_irq_14 = 0;
         int IRQ14_registered = 0;
@@ -1603,8 +1603,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)
         /* now look for other adapters in MCA slots, */
         /* determine the number of known IBM-SCSI-subsystem types */
         /* see the pos[2] dependence to get the adapter port-offset. */
-        list_size = sizeof(subsys_list) / sizeof(struct subsys_list_struct);
-        for (i = 0; i < list_size; i++) {
+        for (i = 0; i < ARRAY_SIZE(subsys_list); i++) {
                 /* scan each slot for a fitting adapter id */
                 slot = 0;       /* start at slot 0 */
                 while ((slot = mca_find_adapter(subsys_list[i].mca_id, slot))
@@ -1669,8 +1668,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template)
         /* now check for SCSI-adapters, mapped to the integrated SCSI
          * area. E.g. a W/Cache in MCA-slot 9(!). Do the check correct here,
          * as this is a known effect on some models 95xx. */
-        list_size = sizeof(subsys_list) / sizeof(struct subsys_list_struct);
-        for (i = 0; i < list_size; i++) {
+        for (i = 0; i < ARRAY_SIZE(subsys_list); i++) {
                 /* scan each slot for a fitting adapter id */
                 slot = mca_find_adapter(subsys_list[i].mca_id, MCA_INTEGSCSI);
                 if (slot != MCA_NOTFOUND) {     /* scan through all slots */
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index 89a57a62e8ca..883bc92b4d9a 100644
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -1809,7 +1809,7 @@ static int in2000_abort(Scsi_Cmnd * cmd)
 
 
 #define MAX_IN2000_HOSTS 3
-#define MAX_SETUP_ARGS (sizeof(setup_args) / sizeof(char *))
+#define MAX_SETUP_ARGS ARRAY_SIZE(setup_args)
 #define SETUP_BUFFER_SIZE 200
 static char setup_buffer[SETUP_BUFFER_SIZE];
 static char setup_used[MAX_SETUP_ARGS];
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 0cc7f65b584f..913ba95f85bd 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -154,7 +154,6 @@
 static unsigned int i91u_debug = DEBUG_DEFAULT;
 #endif
 
-#define TULSZ(sz)     (sizeof(sz) / sizeof(sz[0]))
 #define TUL_RDWORD(x,y)         (short)(inl((int)((ULONG)((ULONG)x+(UCHAR)y)) ))
 
 typedef struct PCI_ID_Struc {
@@ -2771,7 +2770,7 @@ static int tul_NewReturnNumberOfAdapters(void)
 
         init_i91uAdapter_table();
 
-        for (i = 0; i < TULSZ(i91u_pci_devices); i++)
+        for (i = 0; i < ARRAY_SIZE(i91u_pci_devices); i++)
         {
                 while ((pDev = pci_find_device(i91u_pci_devices[i].vendor_id, i91u_pci_devices[i].device_id, pDev)) != NULL) {
                         if (pci_enable_device(pDev))
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 350c08c60887..5353b28b2939 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -556,7 +556,7 @@ ips_setup(char *ips_str)
                  * We now have key/value pairs.
                  * Update the variables
                  */
-                for (i = 0; i < (sizeof (options) / sizeof (options[0])); i++) {
+                for (i = 0; i < ARRAY_SIZE(options); i++) {
                         if (strnicmp
                             (key, options[i].option_name,
                              strlen(options[i].option_name)) == 0) {
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index e3bd4bc339f4..ce0ba3a174f9 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5492,7 +5492,7 @@ static int __init osst_setup (char *str)
   char *stp;
 
   stp = get_options(str, ARRAY_SIZE(ints), ints);
-        
+
   if (ints[0] > 0) {
         for (i = 0; i < ints[0] && i < ARRAY_SIZE(parms); i++)
                   *parms[i].val = ints[i + 1];
@@ -5507,7 +5507,7 @@ static int __init osst_setup (char *str)
                                 break;
                         }
                 }
-                if (i >= sizeof(parms) / sizeof(struct osst_dev_parm))
+                if (i >= ARRAY_SIZE(parms))
                         printk(KERN_INFO "osst :I: Illegal parameter in '%s'\n",
                                stp);
                 stp = strchr(stp, ',');
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index f09e94af9ade..1bf96ed8f935 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -156,7 +156,7 @@ static int default_irqs[] __initdata =
 static struct override {
     unsigned short io_port;
     int  irq;
-} overrides 
+} overrides
 #ifdef PAS16_OVERRIDE
     [] __initdata = PAS16_OVERRIDE;
 #else
@@ -164,19 +164,19 @@ static struct override {
         {0,IRQ_AUTO}};
 #endif
 
-#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))
+#define NO_OVERRIDES ARRAY_SIZE(overrides)
 
 static struct base {
     unsigned short io_port;
     int noauto;
-} bases[] __initdata = 
+} bases[] __initdata =
         { {PAS16_DEFAULT_BASE_1, 0},
           {PAS16_DEFAULT_BASE_2, 0},
           {PAS16_DEFAULT_BASE_3, 0},
           {PAS16_DEFAULT_BASE_4, 0}
         };
 
-#define NO_BASES (sizeof (bases) / sizeof (struct base))
+#define NO_BASES ARRAY_SIZE(bases)
 
 static const unsigned short  pas16_offset[ 8 ] =
     {
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 5a48e55f9418..77bb2351500c 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4239,15 +4239,12 @@ qla1280_get_token(char *str)
 {
         char *sep;
         long ret = -1;
-        int i, len;
-
-        len = sizeof(setup_token)/sizeof(struct setup_tokens);
+        int i;
 
         sep = strchr(str, ':');
 
         if (sep) {
-                for (i = 0; i < len; i++){
-
+                for (i = 0; i < ARRAY_SIZE(setup_token); i++) {
                         if (!strncmp(setup_token[i].token, str, (sep - str))) {
                                 ret =  setup_token[i].val;
                                 break;
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index c7e78dcf09df..00f4b846360e 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -132,7 +132,7 @@ static const u_char mbox_param[] = {
         PACKB(0, 0)     /* 0x0042 */
 };
 
-#define MAX_MBOX_COMMAND        (sizeof(mbox_param)/sizeof(u_short))
+#define MAX_MBOX_COMMAND        ARRAY_SIZE(mbox_param)
 
 /* queue length's _must_ be power of two: */
 #define QUEUE_DEPTH(in, out, ql)        ((in - out) & (ql))
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index 50c398aab557..327b33a57b0a 100644
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -131,7 +131,7 @@ static const char *raid_state_name(enum raid_state state)
         int i;
         char *name = NULL;
 
-        for (i = 0; i < sizeof(raid_states)/sizeof(raid_states[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(raid_states); i++) {
                 if (raid_states[i].value == state) {
                         name = raid_states[i].name;
                         break;
@@ -161,7 +161,7 @@ static const char *raid_level_name(enum raid_level level)
         int i;
         char *name = NULL;
 
-        for (i = 0; i < sizeof(raid_levels)/sizeof(raid_levels[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(raid_levels); i++) {
                 if (raid_levels[i].value == level) {
                         name = raid_levels[i].name;
                         break;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 68d413c444f9..3ca7b9d3086c 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -30,7 +30,7 @@
 #include "scsi_logging.h"
 
 
-#define SG_MEMPOOL_NR           (sizeof(scsi_sg_pools)/sizeof(struct scsi_host_sg_pool))
+#define SG_MEMPOOL_NR           ARRAY_SIZE(scsi_sg_pools)
 #define SG_MEMPOOL_SIZE         32
 
 struct scsi_host_sg_pool {
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index a6fde52946d6..5ec7a4fb0145 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -39,7 +39,7 @@ const char *scsi_device_state_name(enum scsi_device_state state)
         int i;
         char *name = NULL;
 
-        for (i = 0; i < sizeof(sdev_states)/sizeof(sdev_states[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(sdev_states); i++) {
                 if (sdev_states[i].value == state) {
                         name = sdev_states[i].name;
                         break;
@@ -65,7 +65,7 @@ const char *scsi_host_state_name(enum scsi_host_state state)
         int i;
         char *name = NULL;
 
-        for (i = 0; i < sizeof(shost_states)/sizeof(shost_states[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(shost_states); i++) {
                 if (shost_states[i].value == state) {
                         name = shost_states[i].name;
                         break;
@@ -160,7 +160,7 @@ store_shost_state(struct class_device *class_dev, const char *buf, size_t count)
         struct Scsi_Host *shost = class_to_shost(class_dev);
         enum scsi_host_state state = 0;
 
-        for (i = 0; i < sizeof(shost_states)/sizeof(shost_states[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(shost_states); i++) {
                 const int len = strlen(shost_states[i].name);
                 if (strncmp(shost_states[i].name, buf, len) == 0 &&
                    buf[len] == '\n') {
@@ -466,7 +466,7 @@ store_state_field(struct device *dev, struct device_attribute *attr, const char
         struct scsi_device *sdev = to_scsi_device(dev);
         enum scsi_device_state state = 0;
 
-        for (i = 0; i < sizeof(sdev_states)/sizeof(sdev_states[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(sdev_states); i++) {
                 const int len = strlen(sdev_states[i].name);
                 if (strncmp(sdev_states[i].name, buf, len) == 0 &&
                    buf[len] == '\n') {
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 95c5478dcdfd..f2db7a41cf1d 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -50,7 +50,7 @@ static const char *get_fc_##title##_name(enum table_type table_key)	\
         int i;                                                          \
         char *name = NULL;                                              \
                                                                         \
-        for (i = 0; i < sizeof(table)/sizeof(table[0]); i++) {          \
+        for (i = 0; i < ARRAY_SIZE(table); i++) {                       \
                 if (table[i].value == table_key) {                      \
                         name = table[i].name;                           \
                         break;                                          \
@@ -65,7 +65,7 @@ static int get_fc_##title##_match(const char *table_key,		\
 {                                                                       \
         int i;                                                          \
                                                                         \
-        for (i = 0; i < sizeof(table)/sizeof(table[0]); i++) {          \
+        for (i = 0; i < ARRAY_SIZE(table); i++) {                       \
                 if (strncmp(table_key, table[i].name,                   \
                                 table[i].matchlen) == 0) {              \
                         *value = table[i].value;                        \
@@ -140,7 +140,7 @@ get_fc_##title##_names(u32 table_key, char *buf)		\
         ssize_t len = 0;                                        \
         int i;                                                  \
                                                                 \
-        for (i = 0; i < sizeof(table)/sizeof(table[0]); i++) {  \
+        for (i = 0; i < ARRAY_SIZE(table); i++) {               \
                 if (table[i].value & table_key) {               \
                         len += sprintf(buf + len, "%s%s",       \
                                 prefix, table[i].name);         \
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 8b6d65e21bae..ce4f806bd8ec 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -65,7 +65,7 @@ get_sas_##title##_names(u32 table_key, char *buf)		\
         ssize_t len = 0;                                        \
         int i;                                                  \
                                                                 \
-        for (i = 0; i < sizeof(table)/sizeof(table[0]); i++) {  \
+        for (i = 0; i < ARRAY_SIZE(table); i++) {               \
                 if (table[i].value & table_key) {               \
                         len += sprintf(buf + len, "%s%s",       \
                                 prefix, table[i].name);         \
@@ -83,7 +83,7 @@ get_sas_##title##_names(u32 table_key, char *buf)		\
         ssize_t len = 0;                                        \
         int i;                                                  \
                                                                 \
-        for (i = 0; i < sizeof(table)/sizeof(table[0]); i++) {  \
+        for (i = 0; i < ARRAY_SIZE(table); i++) {               \
                 if (table[i].value == table_key) {              \
                         len += sprintf(buf + len, "%s",         \
                                 table[i].name);                 \
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 780aaedcbce9..5829f97a2068 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -146,7 +146,7 @@ static inline const char *spi_signal_to_string(enum spi_signal_type type)
 {
         int i;
 
-        for (i = 0; i < sizeof(signal_types)/sizeof(signal_types[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(signal_types); i++) {
                 if (type == signal_types[i].value)
                         return signal_types[i].name;
         }
@@ -156,7 +156,7 @@ static inline enum spi_signal_type spi_signal_to_value(const char *name)
 {
         int i, len;
 
-        for (i = 0; i < sizeof(signal_types)/sizeof(signal_types[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(signal_types); i++) {
                 len =  strlen(signal_types[i].name);
                 if (strncmp(name, signal_types[i].name, len) == 0 &&
                     (name[len] == '\n' || name[len] == '\0'))
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a112e49e946f..354199011246 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -175,7 +175,7 @@ static ssize_t sd_store_cache_type(struct class_device *cdev, const char *buf,
                  * it's not worth the risk */
                 return -EINVAL;
 
-        for (i = 0; i < sizeof(sd_cache_types)/sizeof(sd_cache_types[0]); i++) {
+        for (i = 0; i < ARRAY_SIZE(sd_cache_types); i++) {
                 const int len = strlen(sd_cache_types[i]);
                 if (strncmp(sd_cache_types[i], buf, len) == 0 &&
                     buf[len] == '\n') {
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index 0ff83ddf13fe..7fa4da4ea64f 100644
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -312,7 +312,7 @@ static Signature __initdata signatures[] = {
         {"IBM F1 V1.2009/22/93", 5, 25, FD},
 };
 
-#define NUM_SIGNATURES (sizeof(signatures) / sizeof(Signature))
+#define NUM_SIGNATURES ARRAY_SIZE(signatures)
 #endif                          /* n OVERRIDE */
 
 /*
@@ -457,7 +457,7 @@ int __init seagate_st0x_detect (struct scsi_host_template * tpnt)
  * space for the on-board RAM instead.
  */
 
-                for (i = 0; i < (sizeof (seagate_bases) / sizeof (unsigned int)); ++i) {
+                for (i = 0; i < ARRAY_SIZE(seagate_bases); ++i) {
                         void __iomem *p = ioremap(seagate_bases[i], 0x2000);
                         if (!p)
                                 continue;
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index b098942445ec..98b9312ba8da 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -2635,8 +2635,7 @@ static int
 sg_proc_init(void)
 {
         int k, mask;
-        int num_leaves =
-            sizeof (sg_proc_leaf_arr) / sizeof (sg_proc_leaf_arr[0]);
+        int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
         struct proc_dir_entry *pdep;
         struct sg_proc_leaf * leaf;
 
@@ -2661,8 +2660,7 @@ static void
 sg_proc_cleanup(void)
 {
         int k;
-        int num_leaves =
-            sizeof (sg_proc_leaf_arr) / sizeof (sg_proc_leaf_arr[0]);
+        int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
 
         if (!sg_proc_sgp)
                 return;
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index d40e7c871c36..2691248b2cbd 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3839,7 +3839,7 @@ static int __init st_setup(char *str)
                                         break;
                                 }
                         }
-                        if (i >= sizeof(parms) / sizeof(struct st_dev_parm))
+                        if (i >= ARRAY_SIZE(parms))
                                  printk(KERN_WARNING "st: invalid parameter in '%s'\n",
                                         stp);
                         stp = strchr(stp, ',');
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index a671bdc07450..940fa1e6f994 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -1276,8 +1276,7 @@ static struct sym_chip sym_dev_table[] = {
  FE_RAM|FE_IO256|FE_LEDC}
 };
 
-#define sym_num_devs \
-        (sizeof(sym_dev_table) / sizeof(sym_dev_table[0]))
+#define sym_num_devs (ARRAY_SIZE(sym_dev_table))
 
 /*
  *  Look up the chip table.
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 21305fc91479..a24f661b0270 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -126,15 +126,15 @@
 static struct override {
     unsigned long address;
     int irq;
-} overrides 
+} overrides
 #ifdef T128_OVERRIDE
     [] __initdata = T128_OVERRIDE;
 #else
-    [4] __initdata = {{0, IRQ_AUTO}, {0, IRQ_AUTO}, 
+    [4] __initdata = {{0, IRQ_AUTO}, {0, IRQ_AUTO},
         {0 ,IRQ_AUTO}, {0, IRQ_AUTO}};
 #endif
 
-#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))
+#define NO_OVERRIDES ARRAY_SIZE(overrides)
 
 static struct base {
     unsigned int address;
@@ -143,7 +143,7 @@ static struct base {
     { 0xcc000, 0}, { 0xc8000, 0}, { 0xdc000, 0}, { 0xd8000, 0}
 };
 
-#define NO_BASES (sizeof (bases) / sizeof (struct base))
+#define NO_BASES ARRAY_SIZE(bases)
 
 static struct signature {
     const char *string;
@@ -152,7 +152,7 @@ static struct signature {
 {"TSROM: SCSI BIOS, Version 1.12", 0x36},
 };
 
-#define NO_SIGNATURES (sizeof (signatures) /  sizeof (struct signature))
+#define NO_SIGNATURES ARRAY_SIZE(signatures)
 
 /*
  * Function : t128_setup(char *str, int *ints)
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index d8a72609a31d..9341703dee00 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -1701,7 +1701,7 @@ wd33c93_abort(struct scsi_cmnd * cmd)
 }
 
 #define MAX_WD33C93_HOSTS 4
-#define MAX_SETUP_ARGS ((int)(sizeof(setup_args) / sizeof(char *)))
+#define MAX_SETUP_ARGS ARRAY_SIZE(setup_args)
 #define SETUP_BUFFER_SIZE 200
 static char setup_buffer[SETUP_BUFFER_SIZE];
 static char setup_used[MAX_SETUP_ARGS];
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index fb54a87a80a3..e55f0ee7e7e4 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -267,7 +267,7 @@ static const long wd7000_biosaddr[] = {
         0xc0000, 0xc2000, 0xc4000, 0xc6000, 0xc8000, 0xca000, 0xcc000, 0xce000,
         0xd0000, 0xd2000, 0xd4000, 0xd6000, 0xd8000, 0xda000, 0xdc000, 0xde000
 };
-#define NUM_ADDRS (sizeof(wd7000_biosaddr)/sizeof(long))
+#define NUM_ADDRS ARRAY_SIZE(wd7000_biosaddr)
 
 static const unsigned short wd7000_iobase[] = {
         0x0300, 0x0308, 0x0310, 0x0318, 0x0320, 0x0328, 0x0330, 0x0338,
@@ -275,13 +275,13 @@ static const unsigned short wd7000_iobase[] = {
         0x0380, 0x0388, 0x0390, 0x0398, 0x03a0, 0x03a8, 0x03b0, 0x03b8,
         0x03c0, 0x03c8, 0x03d0, 0x03d8, 0x03e0, 0x03e8, 0x03f0, 0x03f8
 };
-#define NUM_IOPORTS (sizeof(wd7000_iobase)/sizeof(unsigned short))
+#define NUM_IOPORTS ARRAY_SIZE(wd7000_iobase)
 
 static const short wd7000_irq[] = { 3, 4, 5, 7, 9, 10, 11, 12, 14, 15 };
-#define NUM_IRQS (sizeof(wd7000_irq)/sizeof(short))
+#define NUM_IRQS ARRAY_SIZE(wd7000_irq)
 
 static const short wd7000_dma[] = { 5, 6, 7 };
-#define NUM_DMAS (sizeof(wd7000_dma)/sizeof(short))
+#define NUM_DMAS ARRAY_SIZE(wd7000_dma)
 
 /*
  * The following is set up by wd7000_detect, and used thereafter for
@@ -317,7 +317,7 @@ static Config configs[] = {
         {7, 6, 0x350, BUS_ON, BUS_OFF}, /* My configuration (Zaga)     */
         {-1, -1, 0x0, BUS_ON, BUS_OFF}  /* Empty slot                  */
 };
-#define NUM_CONFIGS (sizeof(configs)/sizeof(Config))
+#define NUM_CONFIGS ARRAY_SIZE(configs)
 
 /*
  *  The following list defines strings to look for in the BIOS that identify
@@ -333,7 +333,7 @@ typedef struct signature {
 static const Signature signatures[] = {
         {"SSTBIOS", 0x0000d, 7} /* "SSTBIOS" @ offset 0x0000d */
 };
-#define NUM_SIGNATURES (sizeof(signatures)/sizeof(Signature))
+#define NUM_SIGNATURES ARRAY_SIZE(signatures)
 
 
 /*