[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>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 2c801672d8b..eadfefdd8d7 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