Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'

[linux-drm-fsl-dcu.git] / drivers / ata / pata_platform.c

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 = {