Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a64d01dc authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

scsi: remove struct scsi_dh_devlist 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent cd37743f

drivers/scsi/device_handler/scsi_dh_emc.c

+4 −2
Original line number Diff line number Diff line
@@ -622,7 +622,10 @@ static int clariion_set_params(struct scsi_device *sdev, const char *params) 
	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,

drivers/scsi/device_handler/scsi_dh_hp_sw.c

+4 −2
Original line number Diff line number Diff line
@@ -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,

drivers/scsi/device_handler/scsi_dh_rdac.c

+4 −2
Original line number Diff line number Diff line
@@ -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,

include/scsi/scsi_device.h

+0 −6
Original line number Diff line number Diff line
@@ -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 *);