From e7ba29d6332850512ad45f154cfd5601fea39f85 Mon Sep 17 00:00:00 2001 From: "Moger, Babu" Date: Tue, 4 Sep 2012 17:04:33 +0000 Subject: [SCSI] scsi_dh_rdac: Add a new netapp vendor/product string This patch adds a new vendor/product strings for netapp E series product. Also consolidated the strings together with similar names. Signed-off-by: Babu Moger Signed-off-by: James Bottomley --- drivers/scsi/device_handler/scsi_dh_rdac.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'drivers/scsi/device_handler/scsi_dh_rdac.c') diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c index 20c4557f5abd..1fc64389b63f 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c @@ -795,24 +795,25 @@ static const struct scsi_dh_devlist rdac_dev_list[] = { {"SGI", "TP9700"}, {"SGI", "IS"}, {"STK", "OPENstorage D280"}, + {"STK", "FLEXLINE 380"}, + {"SUN", "CSM100_R_FC"}, {"SUN", "CSM200_R"}, {"SUN", "LCSM100_I"}, {"SUN", "LCSM100_S"}, {"SUN", "LCSM100_E"}, {"SUN", "LCSM100_F"}, + {"SUN", "STK6580_6780"}, + {"SUN", "SUN_6180"}, + {"SUN", "ArrayStorage"}, {"DELL", "MD3000"}, {"DELL", "MD3000i"}, {"DELL", "MD32xx"}, {"DELL", "MD32xxi"}, {"DELL", "MD36xxi"}, {"DELL", "MD36xxf"}, + {"NETAPP", "INF-01-00"}, {"LSI", "INF-01-00"}, {"ENGENIO", "INF-01-00"}, - {"STK", "FLEXLINE 380"}, - {"SUN", "CSM100_R_FC"}, - {"SUN", "STK6580_6780"}, - {"SUN", "SUN_6180"}, - {"SUN", "ArrayStorage"}, {NULL, NULL}, }; -- cgit v1.2.3-59-g8ed1b From 35204772ea034b380bc9d8942699dc03898e5c13 Mon Sep 17 00:00:00 2001 From: "Moger, Babu" Date: Tue, 4 Sep 2012 17:05:15 +0000 Subject: [SCSI] scsi_dh_rdac : Consolidate rdac strings together This patch consolidates the strings together. Purpose is to remove minor product strings extensions. That way the future products with similar strings should not require change here. Signed-off-by: Babu Moger Signed-off-by: James Bottomley --- drivers/scsi/device_handler/scsi_dh_rdac.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'drivers/scsi/device_handler/scsi_dh_rdac.c') diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c index 1fc64389b63f..a44676ce1a0d 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c @@ -790,27 +790,16 @@ static const struct scsi_dh_devlist rdac_dev_list[] = { {"IBM", "1815"}, {"IBM", "1818"}, {"IBM", "3526"}, - {"SGI", "TP9400"}, - {"SGI", "TP9500"}, - {"SGI", "TP9700"}, + {"SGI", "TP9"}, {"SGI", "IS"}, {"STK", "OPENstorage D280"}, {"STK", "FLEXLINE 380"}, - {"SUN", "CSM100_R_FC"}, - {"SUN", "CSM200_R"}, - {"SUN", "LCSM100_I"}, - {"SUN", "LCSM100_S"}, - {"SUN", "LCSM100_E"}, - {"SUN", "LCSM100_F"}, + {"SUN", "CSM"}, + {"SUN", "LCSM100"}, {"SUN", "STK6580_6780"}, {"SUN", "SUN_6180"}, {"SUN", "ArrayStorage"}, - {"DELL", "MD3000"}, - {"DELL", "MD3000i"}, - {"DELL", "MD32xx"}, - {"DELL", "MD32xxi"}, - {"DELL", "MD36xxi"}, - {"DELL", "MD36xxf"}, + {"DELL", "MD3"}, {"NETAPP", "INF-01-00"}, {"LSI", "INF-01-00"}, {"ENGENIO", "INF-01-00"}, -- cgit v1.2.3-59-g8ed1b From 1315da30daaf8f4b1207cc78b67ff0dc55bc447b Mon Sep 17 00:00:00 2001 From: "Moger, Babu" Date: Tue, 4 Sep 2012 17:13:18 +0000 Subject: [SCSI] scsi_dh_rdac : minor return fix for rdac Signed-off-by: Babu Moger Signed-off-by: James Bottomley --- drivers/scsi/device_handler/scsi_dh_rdac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/scsi/device_handler/scsi_dh_rdac.c') diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c index a44676ce1a0d..69c915aa77c2 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c @@ -853,7 +853,7 @@ static int rdac_bus_attach(struct scsi_device *sdev) if (!scsi_dh_data) { sdev_printk(KERN_ERR, sdev, "%s: Attach failed\n", RDAC_NAME); - return 0; + return -ENOMEM; } scsi_dh_data->scsi_dh = &rdac_dh; -- cgit v1.2.3-59-g8ed1b