6 files changed, 83 insertions, 262 deletions

diff --git a/drivers/ide/pci/Makefile b/drivers/ide/pci/Makefile
index 02e6ee7d751d..ab44a1f5f5a9 100644
--- a/drivers/ide/pci/Makefile
+++ b/drivers/ide/pci/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_BLK_DEV_CS5535)		+= cs5535.o
 obj-$(CONFIG_BLK_DEV_SC1200)            += sc1200.o
 obj-$(CONFIG_BLK_DEV_CY82C693)          += cy82c693.o
 obj-$(CONFIG_BLK_DEV_DELKIN)            += delkin_cb.o
-obj-$(CONFIG_BLK_DEV_HPT34X)            += hpt34x.o
 obj-$(CONFIG_BLK_DEV_HPT366)            += hpt366.o
 obj-$(CONFIG_BLK_DEV_IT8213)            += it8213.o
 obj-$(CONFIG_BLK_DEV_IT821X)            += it821x.o
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 8689a706f537..8f1b2d9f0513 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -46,10 +46,27 @@ static const struct ide_port_ops delkin_cb_port_ops = {
         .quirkproc              = ide_undecoded_slave,
 };
 
+static unsigned int delkin_cb_init_chipset(struct pci_dev *dev)
+{
+        unsigned long base = pci_resource_start(dev, 0);
+        int i;
+
+        outb(0x02, base + 0x1e);        /* set nIEN to block interrupts */
+        inb(base + 0x17);               /* read status to clear interrupts */
+
+        for (i = 0; i < sizeof(setup); ++i) {
+                if (setup[i])
+                        outb(setup[i], base + i);
+        }
+
+        return 0;
+}
+
 static const struct ide_port_info delkin_cb_port_info = {
         .port_ops               = &delkin_cb_port_ops,
         .host_flags             = IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS |
                                   IDE_HFLAG_NO_DMA,
+        .init_chipset           = delkin_cb_init_chipset,
 };
 
 static int __devinit
@@ -57,7 +74,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 {
         struct ide_host *host;
         unsigned long base;
-        int i, rc;
+        int rc;
         hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
         rc = pci_enable_device(dev);
@@ -72,12 +89,8 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
                 return rc;
         }
         base = pci_resource_start(dev, 0);
-        outb(0x02, base + 0x1e);        /* set nIEN to block interrupts */
-        inb(base + 0x17);               /* read status to clear interrupts */
-        for (i = 0; i < sizeof(setup); ++i) {
-                if (setup[i])
-                        outb(setup[i], base + i);
-        }
+
+        delkin_cb_init_chipset(dev);
 
         memset(&hw, 0, sizeof(hw));
         ide_std_init_ports(&hw, base + 0x10, base + 0x1e);
@@ -110,6 +123,40 @@ delkin_cb_remove (struct pci_dev *dev)
         pci_disable_device(dev);
 }
 
+#ifdef CONFIG_PM
+static int delkin_cb_suspend(struct pci_dev *dev, pm_message_t state)
+{
+        pci_save_state(dev);
+        pci_disable_device(dev);
+        pci_set_power_state(dev, pci_choose_state(dev, state));
+
+        return 0;
+}
+
+static int delkin_cb_resume(struct pci_dev *dev)
+{
+        struct ide_host *host = pci_get_drvdata(dev);
+        int rc;
+
+        pci_set_power_state(dev, PCI_D0);
+
+        rc = pci_enable_device(dev);
+        if (rc)
+                return rc;
+
+        pci_restore_state(dev);
+        pci_set_master(dev);
+
+        if (host->init_chipset)
+                host->init_chipset(dev);
+
+        return 0;
+}
+#else
+#define delkin_cb_suspend NULL
+#define delkin_cb_resume NULL
+#endif
+
 static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = {
         { 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         { 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -122,6 +169,8 @@ static struct pci_driver delkin_cb_pci_driver = {
         .id_table       = delkin_cb_pci_tbl,
         .probe          = delkin_cb_probe,
         .remove         = delkin_cb_remove,
+        .suspend        = delkin_cb_suspend,
+        .resume         = delkin_cb_resume,
 };
 
 static int __init delkin_cb_init(void)
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
deleted file mode 100644
index fb1a3aa57f07..000000000000
--- a/drivers/ide/pci/hpt34x.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 1998-2000      Andre Hedrick <andre@linux-ide.org>
- *
- * May be copied or modified under the terms of the GNU General Public License
- *
- *
- * 00:12.0 Unknown mass storage controller:
- * Triones Technologies, Inc.
- * Unknown device 0003 (rev 01)
- *
- * hde: UDMA 2 (0x0000 0x0002) (0x0000 0x0010)
- * hdf: UDMA 2 (0x0002 0x0012) (0x0010 0x0030)
- * hde: DMA 2  (0x0000 0x0002) (0x0000 0x0010)
- * hdf: DMA 2  (0x0002 0x0012) (0x0010 0x0030)
- * hdg: DMA 1  (0x0012 0x0052) (0x0030 0x0070)
- * hdh: DMA 1  (0x0052 0x0252) (0x0070 0x00f0)
- *
- * ide-pci.c reference
- *
- * Since there are two cards that report almost identically,
- * the only discernable difference is the values reported in pcicmd.
- * Booting-BIOS card or HPT363 :: pcicmd == 0x07
- * Non-bootable card or HPT343 :: pcicmd == 0x05
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/ide.h>
-
-#define DRV_NAME "hpt34x"
-
-#define HPT343_DEBUG_DRIVE_INFO         0
-
-static void hpt34x_set_mode(ide_drive_t *drive, const u8 speed)
-{
-        struct pci_dev *dev = to_pci_dev(drive->hwif->dev);
-        u32 reg1= 0, tmp1 = 0, reg2 = 0, tmp2 = 0;
-        u8                      hi_speed, lo_speed;
-
-        hi_speed = speed >> 4;
-        lo_speed = speed & 0x0f;
-
-        if (hi_speed & 7) {
-                hi_speed = (hi_speed & 4) ? 0x01 : 0x10;
-        } else {
-                lo_speed <<= 5;
-                lo_speed >>= 5;
-        }
-
-        pci_read_config_dword(dev, 0x44, &reg1);
-        pci_read_config_dword(dev, 0x48, &reg2);
-        tmp1 = ((lo_speed << (3*drive->dn)) | (reg1 & ~(7 << (3*drive->dn))));
-        tmp2 = ((hi_speed << drive->dn) | (reg2 & ~(0x11 << drive->dn)));
-        pci_write_config_dword(dev, 0x44, tmp1);
-        pci_write_config_dword(dev, 0x48, tmp2);
-
-#if HPT343_DEBUG_DRIVE_INFO
-        printk("%s: %s drive%d (0x%04x 0x%04x) (0x%04x 0x%04x)" \
-                " (0x%02x 0x%02x)\n",
-                drive->name, ide_xfer_verbose(speed),
-                drive->dn, reg1, tmp1, reg2, tmp2,
-                hi_speed, lo_speed);
-#endif /* HPT343_DEBUG_DRIVE_INFO */
-}
-
-static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio)
-{
-        hpt34x_set_mode(drive, XFER_PIO_0 + pio);
-}
-
-/*
- * If the BIOS does not set the IO base addaress to XX00, 343 will fail.
- */
-#define HPT34X_PCI_INIT_REG             0x80
-
-static unsigned int init_chipset_hpt34x(struct pci_dev *dev)
-{
-        int i = 0;
-        unsigned long hpt34xIoBase = pci_resource_start(dev, 4);
-        unsigned long hpt_addr[4] = { 0x20, 0x34, 0x28, 0x3c };
-        unsigned long hpt_addr_len[4] = { 7, 3, 7, 3 };
-        u16 cmd;
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        pci_write_config_byte(dev, HPT34X_PCI_INIT_REG, 0x00);
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-
-        if (cmd & PCI_COMMAND_MEMORY)
-                pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xF0);
-        else
-                pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x20);
-
-        /*
-         * Since 20-23 can be assigned and are R/W, we correct them.
-         */
-        pci_write_config_word(dev, PCI_COMMAND, cmd & ~PCI_COMMAND_IO);
-        for(i=0; i<4; i++) {
-                dev->resource[i].start = (hpt34xIoBase + hpt_addr[i]);
-                dev->resource[i].end = dev->resource[i].start + hpt_addr_len[i];
-                dev->resource[i].flags = IORESOURCE_IO;
-                pci_write_config_dword(dev,
-                                (PCI_BASE_ADDRESS_0 + (i * 4)),
-                                dev->resource[i].start);
-        }
-        pci_write_config_word(dev, PCI_COMMAND, cmd);
-
-        local_irq_restore(flags);
-
-        return dev->irq;
-}
-
-static const struct ide_port_ops hpt34x_port_ops = {
-        .set_pio_mode           = hpt34x_set_pio_mode,
-        .set_dma_mode           = hpt34x_set_mode,
-};
-
-#define IDE_HFLAGS_HPT34X \
-        (IDE_HFLAG_NO_ATAPI_DMA | \
-         IDE_HFLAG_NO_DSC | \
-         IDE_HFLAG_NO_AUTODMA)
-
-static const struct ide_port_info hpt34x_chipsets[] __devinitdata = {
-        { /* 0: HPT343 */
-                .name           = DRV_NAME,
-                .init_chipset   = init_chipset_hpt34x,
-                .port_ops       = &hpt34x_port_ops,
-                .host_flags     = IDE_HFLAGS_HPT34X | IDE_HFLAG_NON_BOOTABLE,
-                .pio_mask       = ATA_PIO5,
-        },
-        { /* 1: HPT345 */
-                .name           = DRV_NAME,
-                .init_chipset   = init_chipset_hpt34x,
-                .port_ops       = &hpt34x_port_ops,
-                .host_flags     = IDE_HFLAGS_HPT34X | IDE_HFLAG_OFF_BOARD,
-                .pio_mask       = ATA_PIO5,
-#ifdef CONFIG_HPT34X_AUTODMA
-                .swdma_mask     = ATA_SWDMA2,
-                .mwdma_mask     = ATA_MWDMA2,
-                .udma_mask      = ATA_UDMA2,
-#endif
-        }
-};
-
-static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
-{
-        const struct ide_port_info *d;
-        u16 pcicmd = 0;
-
-        pci_read_config_word(dev, PCI_COMMAND, &pcicmd);
-
-        d = &hpt34x_chipsets[(pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0];
-
-        return ide_pci_init_one(dev, d, NULL);
-}
-
-static const struct pci_device_id hpt34x_pci_tbl[] = {
-        { PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT343), 0 },
-        { 0, },
-};
-MODULE_DEVICE_TABLE(pci, hpt34x_pci_tbl);
-
-static struct pci_driver hpt34x_pci_driver = {
-        .name           = "HPT34x_IDE",
-        .id_table       = hpt34x_pci_tbl,
-        .probe          = hpt34x_init_one,
-        .remove         = ide_pci_remove,
-        .suspend        = ide_pci_suspend,
-        .resume         = ide_pci_resume,
-};
-
-static int __init hpt34x_ide_init(void)
-{
-        return ide_pci_register_driver(&hpt34x_pci_driver);
-}
-
-static void __exit hpt34x_ide_exit(void)
-{
-        pci_unregister_driver(&hpt34x_pci_driver);
-}
-
-module_init(hpt34x_ide_init);
-module_exit(hpt34x_ide_exit);
-
-MODULE_AUTHOR("Andre Hedrick");
-MODULE_DESCRIPTION("PCI driver module for Highpoint 34x IDE");
-MODULE_LICENSE("GPL");
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 9cf171cb9376..a7909e9c720e 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -3,7 +3,7 @@
  * Portions Copyright (C) 2001          Sun Microsystems, Inc.
  * Portions Copyright (C) 2003          Red Hat Inc
  * Portions Copyright (C) 2007          Bartlomiej Zolnierkiewicz
- * Portions Copyright (C) 2005-2007     MontaVista Software, Inc.
+ * Portions Copyright (C) 2005-2008     MontaVista Software, Inc.
  *
  * Thanks to HighPoint Technologies for their assistance, and hardware.
  * Special Thanks to Jon Burchmore in SanDiego for the deep pockets, his
@@ -748,26 +748,24 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask)
         struct pci_dev  *dev    = to_pci_dev(hwif->dev);
         struct hpt_info *info   = hpt3xx_get_info(hwif->dev);
 
-        if (drive->quirk_list) {
-                if (info->chip_type >= HPT370) {
-                        u8 scr1 = 0;
-
-                        pci_read_config_byte(dev, 0x5a, &scr1);
-                        if (((scr1 & 0x10) >> 4) != mask) {
-                                if (mask)
-                                        scr1 |=  0x10;
-                                else
-                                        scr1 &= ~0x10;
-                                pci_write_config_byte(dev, 0x5a, scr1);
-                        }
-                } else {
+        if (drive->quirk_list == 0)
+                return;
+
+        if (info->chip_type >= HPT370) {
+                u8 scr1 = 0;
+
+                pci_read_config_byte(dev, 0x5a, &scr1);
+                if (((scr1 & 0x10) >> 4) != mask) {
                         if (mask)
-                                disable_irq(hwif->irq);
+                                scr1 |=  0x10;
                         else
-                                enable_irq (hwif->irq);
+                                scr1 &= ~0x10;
+                        pci_write_config_byte(dev, 0x5a, scr1);
                 }
-        } else
-                outb(ATA_DEVCTL_OBS | (mask ? 2 : 0), hwif->io_ports.ctl_addr);
+        } else if (mask)
+                disable_irq(hwif->irq);
+        else
+                enable_irq(hwif->irq);
 }
 
 /*
@@ -1289,7 +1287,6 @@ static u8 hpt3xx_cable_detect(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev     = to_pci_dev(hwif->dev);
         struct hpt_info *info   = hpt3xx_get_info(hwif->dev);
         int serialize           = HPT_SERIALIZE_IO;
         u8  chip_type           = info->chip_type;
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 9ce1d8059921..49f163aa51e3 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -617,7 +617,6 @@ static int __devinit init_setup_scc(struct pci_dev *dev,
         unsigned long intmask_port;
         unsigned long mode_port;
         unsigned long ecmode_port;
-        unsigned long dma_status_port;
         u32 reg = 0;
         struct scc_ports *ports;
         int rc;
@@ -637,7 +636,6 @@ static int __devinit init_setup_scc(struct pci_dev *dev,
         intmask_port = dma_base + 0x010;
         mode_port = ctl_base + 0x024;
         ecmode_port = ctl_base + 0xf00;
-        dma_status_port = dma_base + 0x004;
 
         /* controller initialization */
         reg = 0;
@@ -843,8 +841,6 @@ static u8 scc_cable_detect(ide_hwif_t *hwif)
 
 static void __devinit init_hwif_scc(ide_hwif_t *hwif)
 {
-        struct scc_ports *ports = ide_get_hwifdata(hwif);
-
         /* PTERADD */
         out_be32((void __iomem *)(hwif->dma_base + 0x018), hwif->dmatable_dma);
 
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index dd634541ce36..8af9b23499fd 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -101,18 +101,8 @@ sgiioc4_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,
         for (i = 0; i <= 7; i++)
                 hw->io_ports_array[i] = reg + i * 4;
 
-        if (ctrl_port)
-                hw->io_ports.ctl_addr = ctrl_port;
-
-        if (irq_port)
-                hw->io_ports.irq_addr = irq_port;
-}
-
-static void
-sgiioc4_maskproc(ide_drive_t * drive, int mask)
-{
-        writeb(ATA_DEVCTL_OBS | (mask ? 2 : 0),
-               (void __iomem *)drive->hwif->io_ports.ctl_addr);
+        hw->io_ports.ctl_addr = ctrl_port;
+        hw->io_ports.irq_addr = irq_port;
 }
 
 static int
@@ -310,16 +300,14 @@ static u8 sgiioc4_read_status(ide_hwif_t *hwif)
         unsigned long port = hwif->io_ports.status_addr;
         u8 reg = (u8) readb((void __iomem *) port);
 
-        if ((port & 0xFFF) == 0x11C) {  /* Status register of IOC4 */
-                if (!(reg & ATA_BUSY)) { /* Not busy... check for interrupt */
-                        unsigned long other_ir = port - 0x110;
-                        unsigned int intr_reg = (u32) readl((void __iomem *) other_ir);
+        if (!(reg & ATA_BUSY)) {        /* Not busy... check for interrupt */
+                unsigned long other_ir = port - 0x110;
+                unsigned int intr_reg = (u32) readl((void __iomem *) other_ir);
 
-                        /* Clear the Interrupt, Error bits on the IOC4 */
-                        if (intr_reg & 0x03) {
-                                writel(0x03, (void __iomem *) other_ir);
-                                intr_reg = (u32) readl((void __iomem *) other_ir);
-                        }
+                /* Clear the Interrupt, Error bits on the IOC4 */
+                if (intr_reg & 0x03) {
+                        writel(0x03, (void __iomem *) other_ir);
+                        intr_reg = (u32) readl((void __iomem *) other_ir);
                 }
         }
 
@@ -332,13 +320,9 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
 {
         struct pci_dev *dev = to_pci_dev(hwif->dev);
         unsigned long dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET;
-        void __iomem *virt_dma_base;
         int num_ports = sizeof (ioc4_dma_regs_t);
         void *pad;
 
-        if (dma_base == 0)
-                return -1;
-
         printk(KERN_INFO "    %s: MMIO-DMA\n", hwif->name);
 
         if (request_mem_region(dma_base, num_ports, hwif->name) == NULL) {
@@ -348,14 +332,8 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
                 return -1;
         }
 
-        virt_dma_base = ioremap(dma_base, num_ports);
-        if (virt_dma_base == NULL) {
-                printk(KERN_ERR "%s(%s) -- ERROR: unable to map addresses "
-                       "0x%lx to 0x%lx\n", __func__, hwif->name,
-                       dma_base, dma_base + num_ports - 1);
-                goto dma_remap_failure;
-        }
-        hwif->dma_base = (unsigned long) virt_dma_base;
+        hwif->dma_base = (unsigned long)hwif->io_ports.irq_addr +
+                         IOC4_DMA_OFFSET;
 
         hwif->sg_max_nents = IOC4_PRD_ENTRIES;
 
@@ -379,9 +357,6 @@ ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
         printk(KERN_INFO "%s: changing from DMA to PIO mode", hwif->name);
 
 dma_pci_alloc_failure:
-        iounmap(virt_dma_base);
-
-dma_remap_failure:
         release_mem_region(dma_base, num_ports);
 
         return -1;
@@ -563,8 +538,6 @@ static const struct ide_port_ops sgiioc4_port_ops = {
         .set_dma_mode           = sgiioc4_set_dma_mode,
         /* reset DMA engine, clear IRQs */
         .resetproc              = sgiioc4_resetproc,
-        /* mask on/off NIEN register */
-        .maskproc               = sgiioc4_maskproc,
 };
 
 static const struct ide_dma_ops sgiioc4_dma_ops = {