lkml.org 
[lkml]   [2014]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3/6] scsi: remove struct scsi_dh_devlist
On 10/19/2014 06:00 PM, Christoph Hellwig wrote:
> All drivers now do their own matching, so there is no more need to expose
> a device list as part of the interface.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/scsi/device_handler/scsi_dh_emc.c | 6 ++++--
> drivers/scsi/device_handler/scsi_dh_hp_sw.c | 6 ++++--
> drivers/scsi/device_handler/scsi_dh_rdac.c | 6 ++++--
> include/scsi/scsi_device.h | 6 ------
> 4 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c
> index c2e26cd..800deb7 100644
> --- a/drivers/scsi/device_handler/scsi_dh_emc.c
> +++ b/drivers/scsi/device_handler/scsi_dh_emc.c
> @@ -622,7 +622,10 @@ done:
> return result;
> }
>
> -static const struct scsi_dh_devlist clariion_dev_list[] = {
> +static const struct {
> + char *vendor;
> + char *model;
> +} clariion_dev_list[] = {
> {"DGC", "RAID"},
> {"DGC", "DISK"},
> {"DGC", "VRAID"},
> @@ -653,7 +656,6 @@ static void clariion_bus_detach(struct scsi_device *sdev);
> static struct scsi_device_handler clariion_dh = {
> .name = CLARIION_NAME,
> .module = THIS_MODULE,
> - .devlist = clariion_dev_list,
> .attach = clariion_bus_attach,
> .detach = clariion_bus_detach,
> .check_sense = clariion_check_sense,
> diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
> index 040998c..aa40fcb 100644
> --- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
> +++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
> @@ -311,7 +311,10 @@ static int hp_sw_activate(struct scsi_device *sdev,
> return 0;
> }
>
> -static const struct scsi_dh_devlist hp_sw_dh_data_list[] = {
> +static const struct {
> + char *vendor;
> + char *model;
> +} hp_sw_dh_data_list[] = {
> {"COMPAQ", "MSA1000 VOLUME"},
> {"COMPAQ", "HSV110"},
> {"HP", "HSV100"},
> @@ -343,7 +346,6 @@ static void hp_sw_bus_detach(struct scsi_device *sdev);
> static struct scsi_device_handler hp_sw_dh = {
> .name = HP_SW_NAME,
> .module = THIS_MODULE,
> - .devlist = hp_sw_dh_data_list,
> .attach = hp_sw_bus_attach,
> .detach = hp_sw_bus_detach,
> .activate = hp_sw_activate,
> diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c
> index ef8caaa..8b09528 100644
> --- a/drivers/scsi/device_handler/scsi_dh_rdac.c
> +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c
> @@ -778,7 +778,10 @@ static int rdac_check_sense(struct scsi_device *sdev,
> return SCSI_RETURN_NOT_HANDLED;
> }
>
> -static const struct scsi_dh_devlist rdac_dev_list[] = {
> +static const struct {
> + char *vendor;
> + char *model;
> +} rdac_dev_list[] = {
> {"IBM", "1722"},
> {"IBM", "1724"},
> {"IBM", "1726"},
> @@ -830,7 +833,6 @@ static void rdac_bus_detach(struct scsi_device *sdev);
> static struct scsi_device_handler rdac_dh = {
> .name = RDAC_NAME,
> .module = THIS_MODULE,
> - .devlist = rdac_dev_list,
> .prep_fn = rdac_prep_fn,
> .check_sense = rdac_check_sense,
> .attach = rdac_bus_attach,
> diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
> index fb46864..ba6c9b7 100644
> --- a/include/scsi/scsi_device.h
> +++ b/include/scsi/scsi_device.h
> @@ -201,11 +201,6 @@ struct scsi_device {
> unsigned long sdev_data[0];
> } __attribute__((aligned(sizeof(unsigned long))));
>
> -struct scsi_dh_devlist {
> - char *vendor;
> - char *model;
> -};
> -
> typedef void (*activate_complete)(void *, int);
> struct scsi_device_handler {
> /* Used by the infrastructure */
> @@ -214,7 +209,6 @@ struct scsi_device_handler {
> /* Filled by the hardware handler */
> struct module *module;
> const char *name;
> - const struct scsi_dh_devlist *devlist;
> int (*check_sense)(struct scsi_device *, struct scsi_sense_hdr *);
> int (*attach)(struct scsi_device *);
> void (*detach)(struct scsi_device *);
>
Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes

--
Dr. Hannes Reinecke zSeries & Storage
hare@suse.de +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2014-10-20 08:21    [W:0.133 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site