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 4f502f9..6bac8a7 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 92cdd4b..243eab3 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 --cc drivers/scsi/osst.c
Simple merge

diff --cc drivers/scsi/scsi_scan.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/ses.c
Simple merge

diff --cc drivers/scsi/sr.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge

diff --cc include/scsi/scsi_driver.h
Simple merge