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: Christoph Hellwig <hch@lst.de>
Reported-by: Shane M Seymour <shane.seymour@hp.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com
Reviewed-by: Hannes Reinecke <hare@suse.de>

diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 4f502f95f3b8d73c28a4f9fdd36d869f9856b235..6bac8a746ee2edc49dad2dd0643d65ba00805508 100644 (file)
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -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,
        },

diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index 92cdd4b06526999953c1cecaad407c6640cafe00..243eab3d10d094e6dffff35f793f1c518e49fc15 100644 (file)
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -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,
        }

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 8c384648eef9985411a6be7cc3be06fa164104e3..5033223f6287703c3f74b8eb5b8048d37845b44a 100644 (file)
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -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,
        }

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index d97597e6337ed2113ba4cc1c831e543e9862c325..0cda53adfd354ba06d6eaf94d14d1c7f22a2d989 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -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);

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index f2e9b1dad5745afce19afd8a1d6a103df662a8d9..54abcb220ab478eb951c5f32d4370b090c6bc895 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -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,

diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 80bfece1a2de74bdcf908a5a381ab5291521741a..b7e79e7646ad2a82aa0e37c43671f3c2191beb4f 100644 (file)
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -693,9 +693,9 @@ static struct class_interface ses_interface = {
 };
 
 static struct scsi_driver ses_template = {
-       .owner                  = THIS_MODULE,
        .gendrv = {
                .name           = "ses",
+               .owner          = THIS_MODULE,
                .probe          = ses_probe,
                .remove         = ses_remove,
        },

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 5ebadc2ace9bbb0e919e7c899aa84742d3608dad..8bd54a64efd6a52aef163f0cbe4f34f5ef9ac71c 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -88,9 +88,9 @@ static struct dev_pm_ops sr_pm_ops = {
 };
 
 static struct scsi_driver sr_template = {
-       .owner                  = THIS_MODULE,
        .gendrv = {
                .name           = "sr",
+               .owner          = THIS_MODULE,
                .probe          = sr_probe,
                .remove         = sr_remove,
                .pm             = &sr_pm_ops,

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index e46e02b24ba47d8953df47e96f2639ffe8fc6d4c..128d3b55bdd9fcc086606605bd787bc7e7ef2a6a 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -202,9 +202,9 @@ static int do_create_sysfs_files(void);
 static void do_remove_sysfs_files(void);
 
 static struct scsi_driver st_template = {
-       .owner                  = THIS_MODULE,
        .gendrv = {
                .name           = "st",
+               .owner          = THIS_MODULE,
                .probe          = st_probe,
                .remove         = st_remove,
        },

diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
index c2b759809d8acb800049dd63a26b6acfc59186f6..891a658aa8673d03b5ad8ac848f3318662d39707 100644 (file)
--- a/include/scsi/scsi_driver.h
+++ b/include/scsi/scsi_driver.h
@@ -9,7 +9,6 @@ struct scsi_cmnd;
 struct scsi_device;
 
 struct scsi_driver {
-       struct module           *owner;
        struct device_driver    gendrv;
 
        void (*rescan)(struct device *);