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

Commit 2b132577 authored by Moger, Babu's avatar Moger, Babu Committed by James Bottomley
Browse files

[SCSI] scsi_dh: code cleanup and remove the references to scsi_dev_info 



All the handlers have now implemented the match function so We don't need to
use scsi_dev_info any more for matching purposes.

Signed-off-by: default avatarBabu Moger <babu.moger@netapp.com>
Acked-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent bee89eae

drivers/scsi/device_handler/scsi_dh.c

+0 −58
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ 




static DEFINE_SPINLOCK(list_lock);

static DEFINE_SPINLOCK(list_lock);

static LIST_HEAD(scsi_dh_list);

static LIST_HEAD(scsi_dh_list);

static int scsi_dh_list_idx = 1;





static struct scsi_device_handler *get_device_handler(const char *name)

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;

	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

 * device_handler_match_function - Match a device handler to a device

 * @sdev - SCSI device to be tested

 * @sdev - SCSI device to be tested
@@ -83,23 +67,6 @@ device_handler_match_function(struct scsi_device *sdev) 
	return found_dh;

	return found_dh;

}

}





/*

 * 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

 * device_handler_match - Attach a device handler to a device

 * @scsi_dh - The device handler to match against or NULL

 * @scsi_dh - The device handler to match against or NULL
@@ -116,8 +83,6 @@ device_handler_match(struct scsi_device_handler *scsi_dh, 
	struct scsi_device_handler *found_dh;

	struct scsi_device_handler *found_dh;





	found_dh = device_handler_match_function(sdev);

	found_dh = device_handler_match_function(sdev);

	if (!found_dh)

		found_dh = device_handler_match_devlist(sdev);





	if (scsi_dh && found_dh != scsi_dh)

	if (scsi_dh && found_dh != scsi_dh)

		found_dh = NULL;

		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 scsi_register_device_handler(struct scsi_device_handler *scsi_dh)

{

{

	int i;





	if (get_device_handler(scsi_dh->name))

	if (get_device_handler(scsi_dh->name))

		return -EBUSY;

		return -EBUSY;





	spin_lock(&list_lock);

	spin_lock(&list_lock);

	scsi_dh->idx = scsi_dh_list_idx++;

	list_add(&scsi_dh->list, &scsi_dh_list);

	list_add(&scsi_dh->list, &scsi_dh_list);

	spin_unlock(&list_lock);

	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);

	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);

	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 scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh)

{

{

	int i;





	if (!get_device_handler(scsi_dh->name))

	if (!get_device_handler(scsi_dh->name))

		return -ENODEV;

		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,

	bus_for_each_dev(&scsi_bus_type, NULL, scsi_dh,

			 scsi_dh_notifier_remove);

			 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);

	spin_lock(&list_lock);

	list_del(&scsi_dh->list);

	list_del(&scsi_dh->list);

	spin_unlock(&list_lock);

	spin_unlock(&list_lock);
@@ -588,10 +535,6 @@ static int __init scsi_dh_init(void) 
{

{

	int r;

	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);

	r = bus_register_notifier(&scsi_bus_type, &scsi_dh_nb);





	if (!r)

	if (!r)
@@ -606,7 +549,6 @@ static void __exit scsi_dh_exit(void) 
	bus_for_each_dev(&scsi_bus_type, NULL, NULL,

	bus_for_each_dev(&scsi_bus_type, NULL, NULL,

			 scsi_dh_sysfs_attr_remove);

			 scsi_dh_sysfs_attr_remove);

	bus_unregister_notifier(&scsi_bus_type, &scsi_dh_nb);

	bus_unregister_notifier(&scsi_bus_type, &scsi_dh_nb);

	scsi_dev_info_remove_list(SCSI_DEVINFO_DH);

}

}





module_init(scsi_dh_init);

module_init(scsi_dh_init);

drivers/scsi/scsi_priv.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,6 @@ static inline void scsi_log_completion(struct scsi_cmnd *cmd, int disposition) 
enum {

enum {

	SCSI_DEVINFO_GLOBAL = 0,

	SCSI_DEVINFO_GLOBAL = 0,

	SCSI_DEVINFO_SPI,

	SCSI_DEVINFO_SPI,

	SCSI_DEVINFO_DH,

};

};





extern int scsi_get_device_flags(struct scsi_device *sdev,

extern int scsi_get_device_flags(struct scsi_device *sdev,

include/scsi/scsi_device.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -185,7 +185,6 @@ typedef void (*activate_complete)(void *, int); 
struct scsi_device_handler {

struct scsi_device_handler {

	/* Used by the infrastructure */

	/* Used by the infrastructure */

	struct list_head list; /* list of scsi_device_handlers */

	struct list_head list; /* list of scsi_device_handlers */

	int idx;





	/* Filled by the hardware handler */

	/* Filled by the hardware handler */

	struct module *module;

	struct module *module;