ata: pata_platform: fix owner module reference mismatch for scsi host

The owner module reference of the pata_of_platform's scsi_host is
initialized to pata_platform's one, because pata_of_platform driver
use a scsi_host_template defined in pata_platform.  So this drivers
can be unloaded even if the scsi device is being accessed.

This fixes it by propagating the scsi_host_template to pata_of_platform
driver.  The scsi_host_template is passed through a new
argument of __pata_platform_probe().

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-ide@vger.kernel.org
Cc: linux-scsi@vger.kernel.org

diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index dcc408abe17124c7fad39d84f2e2a7739d441ec3..b6b7af894d9dae92a40d140554e7c0923a2c8a7d 100644 (file)
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -16,6 +16,12 @@
 #include <linux/ata_platform.h>
 #include <linux/libata.h>
 
+#define DRV_NAME "pata_of_platform"
+
+static struct scsi_host_template pata_platform_sht = {
+       ATA_PIO_SHT(DRV_NAME),
+};
+
 static int pata_of_platform_probe(struct platform_device *ofdev)
 {
        int ret;
@@ -63,7 +69,7 @@ static int pata_of_platform_probe(struct platform_device *ofdev)
        pio_mask |= (1 << pio_mode) - 1;
 
        return __pata_platform_probe(&ofdev->dev, &io_res, &ctl_res, irq_res,
-                                    reg_shift, pio_mask);
+                                    reg_shift, pio_mask, &pata_platform_sht);
 }
 
 static struct of_device_id pata_of_platform_match[] = {
@@ -74,7 +80,7 @@ MODULE_DEVICE_TABLE(of, pata_of_platform_match);
 
 static struct platform_driver pata_of_platform_driver = {
        .driver = {
-               .name = "pata_of_platform",
+               .name = DRV_NAME,
                .of_match_table = pata_of_platform_match,
        },
        .probe          = pata_of_platform_probe,

diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 1eedfe46d7c833e3d7cf6ea7fb9258cfc01683cc..c503ded87bb88a341cb0c2d1f9e22e0fb9ddd60f 100644 (file)
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -78,6 +78,7 @@ static void pata_platform_setup_port(struct ata_ioports *ioaddr,
  *     @irq_res: Resource representing IRQ and its flags
  *     @ioport_shift: I/O port shift
  *     @__pio_mask: PIO mask
+ *     @sht: scsi_host_template to use when registering
  *
  *     Register a platform bus IDE interface. Such interfaces are PIO and we
  *     assume do not support IRQ sharing.
@@ -99,7 +100,8 @@ static void pata_platform_setup_port(struct ata_ioports *ioaddr,
  */
 int __pata_platform_probe(struct device *dev, struct resource *io_res,
                          struct resource *ctl_res, struct resource *irq_res,
-                         unsigned int ioport_shift, int __pio_mask)
+                         unsigned int ioport_shift, int __pio_mask,
+                         struct scsi_host_template *sht)
 {
        struct ata_host *host;
        struct ata_port *ap;
@@ -170,7 +172,7 @@ int __pata_platform_probe(struct device *dev, struct resource *io_res,
 
        /* activate */
        return ata_host_activate(host, irq, irq ? ata_sff_interrupt : NULL,
-                                irq_flags, &pata_platform_sht);
+                                irq_flags, sht);
 }
 EXPORT_SYMBOL_GPL(__pata_platform_probe);
 
@@ -216,7 +218,7 @@ static int pata_platform_probe(struct platform_device *pdev)
 
        return __pata_platform_probe(&pdev->dev, io_res, ctl_res, irq_res,
                                     pp_info ? pp_info->ioport_shift : 0,
-                                    pio_mask);
+                                    pio_mask, &pata_platform_sht);
 }
 
 static struct platform_driver pata_platform_driver = {

diff --git a/include/linux/ata_platform.h b/include/linux/ata_platform.h
index 5c618a084225ebda350e969931434b5a26846448..619d9e78e6447db2cb4df71f6464b19f07e790f0 100644 (file)
--- a/include/linux/ata_platform.h
+++ b/include/linux/ata_platform.h
@@ -10,12 +10,15 @@ struct pata_platform_info {
        unsigned int ioport_shift;
 };
 
+struct scsi_host_template;
+
 extern int __pata_platform_probe(struct device *dev,
                                 struct resource *io_res,
                                 struct resource *ctl_res,
                                 struct resource *irq_res,
                                 unsigned int ioport_shift,
-                                int __pio_mask);
+                                int __pio_mask,
+                                struct scsi_host_template *sht);
 
 /*
  * Marvell SATA private data