Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
  [SCSI] 53c700: remove reliance on deprecated cmnd fields
  [SCSI] hptiop: don't use cmnd->bufflen
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  [SCSI] aacraid: small misc. cleanups
  [SCSI] aacraid: Update supported product information
  [SCSI] aacraid: Fix return code interpretation
  [SCSI] scsi_transport_sas: fix panic in sas_free_rphy
  [SCSI] remove RQ_SCSI_* flags
  [SCSI] remove scsi_request infrastructure
  [SCSI] mptfusion: change driver revision to 3.03.10
  [SCSI] mptfc: abort of board reset leaves port dead requiring reboot
  [SCSI] mptfc: fix fibre channel infinite request/response loop
  [SCSI] mptfc: set fibre channel fw target missing timers to one second
  [SCSI] mptfusion: move fc event/reset handling to mptfc
  [SCSI] spi transport: don't allow dt to be set on SE or HVD buses
  [SCSI] aic7xxx: expose the bus setting to sysfs
  [SCSI] scsi: remove Documentation/scsi/cpqfc.txt
  [SCSI] drivers/scsi: Use ARRAY_SIZE macro
  [SCSI] Remove last page_address from dc395x.c
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  ...

Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
the sparc interrupt cleanups)

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