devres: release resources on device_del()

[~andy/linux] / drivers / ata / pata_mpiix.c

diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 976663d1fb22b8dcb21191e21ed8fcd12e6e4b64..4abe45ac19a2c121c03655875dd63b951c2c6d35 100644 (file)
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -35,7 +35,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_mpiix"
-#define DRV_VERSION "0.7.3"
+#define DRV_VERSION "0.7.5"
 
 enum {
        IDETIM = 0x6C,          /* IDE control register */
@@ -49,12 +49,9 @@ enum {
 static int mpiix_pre_reset(struct ata_port *ap)
 {
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-       static const struct pci_bits mpiix_enable_bits[] = {
-               { 0x6D, 1, 0x80, 0x80 },
-               { 0x6F, 1, 0x80, 0x80 }
-       };
+       static const struct pci_bits mpiix_enable_bits = { 0x6D, 1, 0x80, 0x80 };
 
-       if (!pci_test_config_bits(pdev, &mpiix_enable_bits[ap->port_no]))
+       if (!pci_test_config_bits(pdev, &mpiix_enable_bits))
                return -ENOENT;
        ap->cbl = ATA_CBL_PATA40;
        return ata_std_prereset(ap);
@@ -80,8 +77,8 @@ static void mpiix_error_handler(struct ata_port *ap)
  *     @adev: ATA device
  *
  *     Called to do the PIO mode setup. The MPIIX allows us to program the
- *     IORDY sample point (2-5 clocks), recovery 1-4 clocks and whether
- *     prefetching or iordy are used.
+ *     IORDY sample point (2-5 clocks), recovery (1-4 clocks) and whether
+ *     prefetching or IORDY are used.
  *
  *     This would get very ugly because we can only program timing for one
  *     device at a time, the other gets PIO0. Fortunately libata calls
@@ -103,18 +100,19 @@ static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev)
                            { 2, 3 }, };
 
        pci_read_config_word(pdev, IDETIM, &idetim);
-       /* Mask the IORDY/TIME/PPE0 bank for this device */
+
+       /* Mask the IORDY/TIME/PPE for this device */
        if (adev->class == ATA_DEV_ATA)
-               control |= PPE;         /* PPE enable for disk */
+               control |= PPE;         /* Enable prefetch/posting for disk */
        if (ata_pio_need_iordy(adev))
-               control |= IORDY;       /* IORDY */
-       if (pio > 0)
+               control |= IORDY;
+       if (pio > 1)
                control |= FTIM;        /* This drive is on the fast timing bank */
 
        /* Mask out timing and clear both TIME bank selects */
        idetim &= 0xCCEE;
-       idetim &= ~(0x07  << (2 * adev->devno));
-       idetim |= (control << (2 * adev->devno));
+       idetim &= ~(0x07  << (4 * adev->devno));
+       idetim |= control << (4 * adev->devno);
 
        idetim |= (timings[pio][0] << 12) | (timings[pio][1] << 8);
        pci_write_config_word(pdev, IDETIM, idetim);
@@ -167,8 +165,10 @@ static struct scsi_host_template mpiix_sht = {
        .slave_configure        = ata_scsi_slave_config,
        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
+#ifdef CONFIG_PM
        .resume                 = ata_scsi_device_resume,
        .suspend                = ata_scsi_device_suspend,
+#endif
 };
 
 static struct ata_port_operations mpiix_port_ops = {
@@ -218,6 +218,7 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
        if (!(idetim & ENABLED))
                return -ENODEV;
 
+       /* See if it's primary or secondary channel... */
        if (!(idetim & SECONDARY)) {
                irq = 14;
                cmd_addr = devm_ioport_map(&dev->dev, 0x1F0, 8);
@@ -242,10 +243,11 @@ static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
        probe.port_ops = &mpiix_port_ops;
        probe.sht = &mpiix_sht;
        probe.pio_mask = 0x1F;
-       probe.irq = irq;
-       probe.irq_flags = SA_SHIRQ;
+       probe.irq_flags = IRQF_SHARED;
        probe.port_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST;
        probe.n_ports = 1;
+
+       probe.irq = irq;
        probe.port[0].cmd_addr = cmd_addr;
        probe.port[0].ctl_addr = ctl_addr;
        probe.port[0].altstatus_addr = ctl_addr;
@@ -270,8 +272,10 @@ static struct pci_driver mpiix_pci_driver = {
        .id_table       = mpiix,
        .probe          = mpiix_init_one,
        .remove         = ata_pci_remove_one,
+#ifdef CONFIG_PM
        .suspend        = ata_pci_device_suspend,
        .resume         = ata_pci_device_resume,
+#endif
 };
 
 static int __init mpiix_init(void)