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

Commit 3af6b352 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

scsi: remove scsi_driver owner field 



The driver core driver structure has grown an owner field and now
requires it to be set for all modular drivers.  Set it up for
all scsi_driver instances and get rid of the now superflous
scsi_driver owner field.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reported-by: default avatarShane M Seymour <shane.seymour@hp.com>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent 82042a2c

drivers/scsi/ch.c

+1 −1
Original line number Diff line number Diff line
@@ -972,9 +972,9 @@ static int ch_remove(struct device *dev) 
}



static struct scsi_driver ch_template = {

	.owner     	= THIS_MODULE,

	.gendrv     	= {

		.name	= "ch",

		.owner	= THIS_MODULE,

		.probe  = ch_probe,

		.remove = ch_remove,

	},

drivers/scsi/osd/osd_uld.c

+1 −1
Original line number Diff line number Diff line
@@ -540,9 +540,9 @@ static int osd_remove(struct device *dev) 
 */



static struct scsi_driver osd_driver = {

	.owner			= THIS_MODULE,

	.gendrv = {

		.name		= osd_name,

		.owner		= THIS_MODULE,

		.probe		= osd_probe,

		.remove		= osd_remove,

	}

drivers/scsi/osst.c

+1 −1
Original line number Diff line number Diff line
@@ -172,9 +172,9 @@ static int osst_probe(struct device *); 
static int osst_remove(struct device *);



static struct scsi_driver osst_template = {

	.owner			= THIS_MODULE,

	.gendrv = {

		.name		=  "osst",

		.owner		= THIS_MODULE,

		.probe		= osst_probe,

		.remove		= osst_remove,

	}

drivers/scsi/scsi_scan.c

+4 −5
Original line number Diff line number Diff line
@@ -1593,16 +1593,15 @@ EXPORT_SYMBOL(scsi_add_device); 


void scsi_rescan_device(struct device *dev)

{

	struct scsi_driver *drv;

	

	if (!dev->driver)

		return;



	drv = to_scsi_driver(dev->driver);

	if (try_module_get(drv->owner)) {

	if (try_module_get(dev->driver->owner)) {

		struct scsi_driver *drv = to_scsi_driver(dev->driver);



		if (drv->rescan)

			drv->rescan(dev);

		module_put(drv->owner);

		module_put(dev->driver->owner);

	}

}

EXPORT_SYMBOL(scsi_rescan_device);

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -510,9 +510,9 @@ static const struct dev_pm_ops sd_pm_ops = { 
};



static struct scsi_driver sd_template = {

	.owner			= THIS_MODULE,

	.gendrv = {

		.name		= "sd",

		.owner		= THIS_MODULE,

		.probe		= sd_probe,

		.remove		= sd_remove,

		.shutdown	= sd_shutdown,