X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fscsi_sysfs.c;fp=drivers%2Fscsi%2Fscsi_sysfs.c;h=902a5def8e62102591e1b2e4657eb560d258efc2;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=e7fe565b96de93ffb5354d4c86d36dfd46410806;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index e7fe565b9..902a5def8 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -6,6 +6,7 @@
  * Created to pull SCSI mid layer sysfs routines into one file.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>
@@ -38,7 +39,7 @@ const char *scsi_device_state_name(enum scsi_device_state state)
 	int i;
 	char *name = NULL;
 
-	for (i = 0; i < ARRAY_SIZE(sdev_states); i++) {
+	for (i = 0; i < sizeof(sdev_states)/sizeof(sdev_states[0]); i++) {
 		if (sdev_states[i].value == state) {
 			name = sdev_states[i].name;
 			break;
@@ -64,7 +65,7 @@ const char *scsi_host_state_name(enum scsi_host_state state)
 	int i;
 	char *name = NULL;
 
-	for (i = 0; i < ARRAY_SIZE(shost_states); i++) {
+	for (i = 0; i < sizeof(shost_states)/sizeof(shost_states[0]); i++) {
 		if (shost_states[i].value == state) {
 			name = shost_states[i].name;
 			break;
@@ -159,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 < ARRAY_SIZE(shost_states); i++) {
+	for (i = 0; i < sizeof(shost_states)/sizeof(shost_states[0]); i++) {
 		const int len = strlen(shost_states[i].name);
 		if (strncmp(shost_states[i].name, buf, len) == 0 &&
 		   buf[len] == '\n') {
@@ -255,9 +256,7 @@ static void scsi_device_dev_release_usercontext(void *data)
 
 static void scsi_device_dev_release(struct device *dev)
 {
-	struct scsi_device *sdp = to_scsi_device(dev);
-	execute_in_process_context(scsi_device_dev_release_usercontext, dev,
-				   &sdp->ew);
+	scsi_execute_in_process_context(scsi_device_dev_release_usercontext,	dev);
 }
 
 static struct class sdev_class = {
@@ -285,7 +284,7 @@ static int scsi_bus_suspend(struct device * dev, pm_message_t state)
 		return err;
 
 	if (sht->suspend)
-		err = sht->suspend(sdev, state);
+		err = sht->suspend(sdev);
 
 	return err;
 }
@@ -465,7 +464,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 < ARRAY_SIZE(sdev_states); i++) {
+	for (i = 0; i < sizeof(sdev_states)/sizeof(sdev_states[0]); i++) {
 		const int len = strlen(sdev_states[i].name);
 		if (strncmp(sdev_states[i].name, buf, len) == 0 &&
 		   buf[len] == '\n') {