aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/raid_class.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-06-22 22:51:46 -0400
committerJeff Garzik <jeff@garzik.org>2006-06-22 22:51:46 -0400
commitdbe1ab9514c231c9b062140a107d9dea0eabefcc (patch)
tree0001c7143cf923fc704215f0a0e54221e9e5cbb9 /drivers/scsi/raid_class.c
parent[PATCH] s2io: netpoll support (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff)
downloadlinux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz
linux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/scsi/raid_class.c')
-rw-r--r--drivers/scsi/raid_class.c4
1 files changed, 2 insertions, 2 deletions
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;