Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

SCSI updates for post 3.2 merge window * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (67 commits) [SCSI] lpfc 8.3.28: Update driver version to 8.3.28 [SCSI] lpfc 8.3.28: Add Loopback support for SLI4 adapters [SCSI] lpfc 8.3.28: Critical Miscellaneous fixes [SCSI] Lpfc 8.3.28: FC and SCSI Discovery Fixes [SCSI] lpfc 8.3.28: Add support for ABTS failure handling [SCSI] lpfc 8.3.28: SLI fixes and added SLI4 support [SCSI] lpfc 8.3.28: Miscellaneous fixes in sysfs and mgmt interfaces [SCSI] mpt2sas: Removed redundant calling of _scsih_probe_devices() from _scsih_probe [SCSI] mac_scsi: Remove obsolete IRQ_FLG_* users [SCSI] qla4xxx: Update driver version to 5.02.00-k10 [SCSI] qla4xxx: check for FW alive before calling chip_reset [SCSI] qla4xxx: Fix qla4xxx_dump_buffer to dump buffer correctly [SCSI] qla4xxx: Fix the IDC locking mechanism [SCSI] qla4xxx: Wait for disable_acb before doing set_acb [SCSI] qla4xxx: Don't recover adapter if device state is FAILED [SCSI] qla4xxx: fix call trace on rmmod with ql4xdontresethba=1 [SCSI] qla4xxx: Fix CPU lockups when ql4xdontresethba set [SCSI] qla4xxx: Perform context resets in case of context failures. [SCSI] iscsi class: export pid of process that created [SCSI] mpt2sas: Remove unused duplicate diag_buffer_enable param ...
author: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-10 13:36:08 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-01-10 13:36:08 -0500
commit: d04baa157d1b35cbd27c87b4a13111d9675b61f3 (patch)
tree: c46966fbea1c34bed2bd38629ce948d5a088281c /drivers/scsi/device_handler
parent: 88266917b518e2ca954d85983470592aaaf82993 (diff)
parent: 5c41dc3a79150e93e5d050871a10b761be8281a1 (diff)
4 files changed, 57 insertions, 58 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c
index 23149b9e297c..48e46f5b77cc 100644
--- a/drivers/scsi/device_handler/scsi_dh.c
+++ b/drivers/scsi/device_handler/scsi_dh.c
@@ -28,7 +28,6 @@
 static DEFINE_SPINLOCK(list_lock);
 static LIST_HEAD(scsi_dh_list);
-static int scsi_dh_list_idx = 1;
 static struct scsi_device_handler *get_device_handler(const char *name)
 {
@@ -45,21 +44,6 @@ static struct scsi_device_handler *get_device_handler(const char *name)
        return found;
 }
-static struct scsi_device_handler *get_device_handler_by_idx(int idx)
-{
-        struct scsi_device_handler *tmp, *found = NULL;
-        spin_lock(&list_lock);
-        list_for_each_entry(tmp, &scsi_dh_list, list) {
-                if (tmp->idx == idx) {
-                        found = tmp;
-                        break;
-                }
-        }
-        spin_unlock(&list_lock);
-        return found;
-}
 /*
 * device_handler_match_function - Match a device handler to a device
 * @sdev - SCSI device to be tested
@@ -84,23 +68,6 @@ device_handler_match_function(struct scsi_device *sdev)
 }
 /*
- * device_handler_match_devlist - Match a device handler to a device
- * @sdev - SCSI device to be tested
- *
- * Tests @sdev against all device_handler registered in the devlist.
- * Returns the found device handler or NULL if not found.
- */
-static struct scsi_device_handler *
-device_handler_match_devlist(struct scsi_device *sdev)
-{
-        int idx;
-        idx = scsi_get_device_flags_keyed(sdev, sdev->vendor, sdev->model,
-                                          SCSI_DEVINFO_DH);
-        return get_device_handler_by_idx(idx);
-}
-/*
 * device_handler_match - Attach a device handler to a device
 * @scsi_dh - The device handler to match against or NULL
 * @sdev - SCSI device to be tested against @scsi_dh
@@ -116,8 +83,6 @@ device_handler_match(struct scsi_device_handler *scsi_dh,
        struct scsi_device_handler *found_dh;
        found_dh = device_handler_match_function(sdev);
-        if (!found_dh)
-                found_dh = device_handler_match_devlist(sdev);
        if (scsi_dh && found_dh != scsi_dh)
                found_dh = NULL;
@@ -361,25 +326,14 @@ static int scsi_dh_notifier_remove(struct device *dev, void *data)
 */
 int scsi_register_device_handler(struct scsi_device_handler *scsi_dh)
 {
-        int i;
        if (get_device_handler(scsi_dh->name))
                return -EBUSY;
        spin_lock(&list_lock);
-        scsi_dh->idx = scsi_dh_list_idx++;
        list_add(&scsi_dh->list, &scsi_dh_list);
        spin_unlock(&list_lock);
-        for (i = 0; scsi_dh->devlist && scsi_dh->devlist[i].vendor; i++) {
-                scsi_dev_info_list_add_keyed(0,
-                                        scsi_dh->devlist[i].vendor,
-                                        scsi_dh->devlist[i].model,
-                                        NULL,
-                                        scsi_dh->idx,
-                                        SCSI_DEVINFO_DH);
-        }
        bus_for_each_dev(&scsi_bus_type, NULL, scsi_dh, scsi_dh_notifier_add);
        printk(KERN_INFO "%s: device handler registered\n", scsi_dh->name);
@@ -396,7 +350,6 @@ EXPORT_SYMBOL_GPL(scsi_register_device_handler);
 */
 int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh)
 {
-        int i;
        if (!get_device_handler(scsi_dh->name))
                return -ENODEV;
@@ -404,12 +357,6 @@ int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh)
        bus_for_each_dev(&scsi_bus_type, NULL, scsi_dh,
                         scsi_dh_notifier_remove);
-        for (i = 0; scsi_dh->devlist && scsi_dh->devlist[i].vendor; i++) {
-                scsi_dev_info_list_del_keyed(scsi_dh->devlist[i].vendor,
-                                             scsi_dh->devlist[i].model,
-                                             SCSI_DEVINFO_DH);
-        }
        spin_lock(&list_lock);
        list_del(&scsi_dh->list);
        spin_unlock(&list_lock);
@@ -588,10 +535,6 @@ static int __init scsi_dh_init(void)
 {
        int r;
-        r = scsi_dev_info_add_list(SCSI_DEVINFO_DH, "SCSI Device Handler");
-        if (r)
-                return r;
        r = bus_register_notifier(&scsi_bus_type, &scsi_dh_nb);
        if (!r)
@@ -606,7 +549,6 @@ static void __exit scsi_dh_exit(void)
        bus_for_each_dev(&scsi_bus_type, NULL, NULL,
                         scsi_dh_sysfs_attr_remove);
        bus_unregister_notifier(&scsi_bus_type, &scsi_dh_nb);
-        scsi_dev_info_remove_list(SCSI_DEVINFO_DH);
 }
 module_init(scsi_dh_init);
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
index 591186cf1896..e1c8be06de9d 100644
--- a/drivers/scsi/device_handler/scsi_dh_emc.c
+++ b/drivers/scsi/device_handler/scsi_dh_emc.c
@@ -629,6 +629,24 @@ static const struct scsi_dh_devlist clariion_dev_list[] = {
        {NULL, NULL},
 };
+static bool clariion_match(struct scsi_device *sdev)
+{
+        int i;
+        if (scsi_device_tpgs(sdev))
+                return false;
+        for (i = 0; clariion_dev_list[i].vendor; i++) {
+                if (!strncmp(sdev->vendor, clariion_dev_list[i].vendor,
+                        strlen(clariion_dev_list[i].vendor)) &&
+                    !strncmp(sdev->model, clariion_dev_list[i].model,
+                        strlen(clariion_dev_list[i].model))) {
+                        return true;
+                }
+        }
+        return false;
+}
 static int clariion_bus_attach(struct scsi_device *sdev);
 static void clariion_bus_detach(struct scsi_device *sdev);
@@ -642,6 +660,7 @@ static struct scsi_device_handler clariion_dh = {
        .activate       = clariion_activate,
        .prep_fn        = clariion_prep_fn,
        .set_params     = clariion_set_params,
+        .match          = clariion_match,
 };
 static int clariion_bus_attach(struct scsi_device *sdev)
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index 0f86a18b157d..084062bb8ee9 100644
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -320,6 +320,24 @@ static const struct scsi_dh_devlist hp_sw_dh_data_list[] = {
        {NULL, NULL},
 };
+static bool hp_sw_match(struct scsi_device *sdev)
+{
+        int i;
+        if (scsi_device_tpgs(sdev))
+                return false;
+        for (i = 0; hp_sw_dh_data_list[i].vendor; i++) {
+                if (!strncmp(sdev->vendor, hp_sw_dh_data_list[i].vendor,
+                        strlen(hp_sw_dh_data_list[i].vendor)) &&
+                    !strncmp(sdev->model, hp_sw_dh_data_list[i].model,
+                        strlen(hp_sw_dh_data_list[i].model))) {
+                        return true;
+                }
+        }
+        return false;
+}
 static int hp_sw_bus_attach(struct scsi_device *sdev);
 static void hp_sw_bus_detach(struct scsi_device *sdev);
@@ -331,6 +349,7 @@ static struct scsi_device_handler hp_sw_dh = {
        .detach         = hp_sw_bus_detach,
        .activate       = hp_sw_activate,
        .prep_fn        = hp_sw_prep_fn,
+        .match          = hp_sw_match,
 };
 static int hp_sw_bus_attach(struct scsi_device *sdev)
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
index 1d3127920063..841ebf4a6788 100644
--- a/drivers/scsi/device_handler/scsi_dh_rdac.c
+++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
@@ -820,6 +820,24 @@ static const struct scsi_dh_devlist rdac_dev_list[] = {
        {NULL, NULL},
 };
+static bool rdac_match(struct scsi_device *sdev)
+{
+        int i;
+        if (scsi_device_tpgs(sdev))
+                return false;
+        for (i = 0; rdac_dev_list[i].vendor; i++) {
+                if (!strncmp(sdev->vendor, rdac_dev_list[i].vendor,
+                        strlen(rdac_dev_list[i].vendor)) &&
+                    !strncmp(sdev->model, rdac_dev_list[i].model,
+                        strlen(rdac_dev_list[i].model))) {
+                        return true;
+                }
+        }
+        return false;
+}
 static int rdac_bus_attach(struct scsi_device *sdev);
 static void rdac_bus_detach(struct scsi_device *sdev);
@@ -832,6 +850,7 @@ static struct scsi_device_handler rdac_dh = {
        .attach = rdac_bus_attach,
        .detach = rdac_bus_detach,
        .activate = rdac_activate,
+        .match = rdac_match,
 };
 static int rdac_bus_attach(struct scsi_device *sdev)
author	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-10 13:36:08 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2012-01-10 13:36:08 -0500
commit	d04baa157d1b35cbd27c87b4a13111d9675b61f3 (patch)
tree	c46966fbea1c34bed2bd38629ce948d5a088281c /drivers/scsi/device_handler
parent	88266917b518e2ca954d85983470592aaaf82993 (diff)
parent	5c41dc3a79150e93e5d050871a10b761be8281a1 (diff)