[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, 4 insertions, 4 deletions

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') {