Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (67 commits)
  ide: remove redundant DMA blacklist check from __ide_dma_on()
  ide: cleanup ide_set_dma()
  ide: remove redundant ->ide_dma_on call from set_using_dma()
  sc1200: move DMA timings to timing tables
  ide: add IDE_HFLAG_ABUSE_SET_DMA_MODE host flag
  sis5513: factor out UDMA programming code
  pdc202xx_new: move PIO programming code to pdcnew_set_pio_mode()
  ide: make 'extra' field in struct ide_port_info u8
  ide: kill duplicate code in ide_dump_{ata,atapi}_status()
  ide-disk: use ide_get_lba_addr()
  ide: printk fix
  ide: add ide_tf_read() helper
  ide: fix registers loading order in ide_dump_ata_status()
  ide-disk: use do_rw_taskfile() (take 2)
  ide-disk: add ide_tf_set_cmd() helper
  ide-disk: extend timeout for PIO-in commands
  ide: remove 'handler' field from ide_task_t (take 2)
  ide: use ->data_phase to set ->handler in do_rw_taskfile()
  ide: convert do_rw_taskfile() to use ->data_phase
  ide: merge flagged_taskfile() into do_rw_taskfile()
  ...

1 files changed, 55 insertions, 117 deletions

diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 707d5ff66b03..fef20bd4aa78 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -135,59 +135,29 @@ static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
         unsigned short          pci_clock;
         unsigned int            basereg = hwif->channel ? 0x50 : 0x40;
 
+        static const u32 udma_timing[3][3] = {
+                { 0x00921250, 0x00911140, 0x00911030 },
+                { 0x00932470, 0x00922260, 0x00922140 },
+                { 0x009436a1, 0x00933481, 0x00923261 },
+        };
+
+        static const u32 mwdma_timing[3][3] = {
+                { 0x00077771, 0x00012121, 0x00002020 },
+                { 0x000bbbb2, 0x00024241, 0x00013131 },
+                { 0x000ffff3, 0x00035352, 0x00015151 },
+        };
+
         pci_clock = sc1200_get_pci_clock();
 
         /*
          * Note that each DMA mode has several timings associated with it.
          * The correct timing depends on the fast PCI clock freq.
          */
-        timings = 0;
-        switch (mode) {
-                case XFER_UDMA_0:
-                        switch (pci_clock) {
-                                case PCI_CLK_33:        timings = 0x00921250;   break;
-                                case PCI_CLK_48:        timings = 0x00932470;   break;
-                                case PCI_CLK_66:        timings = 0x009436a1;   break;
-                        }
-                        break;
-                case XFER_UDMA_1:
-                        switch (pci_clock) {
-                                case PCI_CLK_33:        timings = 0x00911140;   break;
-                                case PCI_CLK_48:        timings = 0x00922260;   break;
-                                case PCI_CLK_66:        timings = 0x00933481;   break;
-                        }
-                        break;
-                case XFER_UDMA_2:
-                        switch (pci_clock) {
-                                case PCI_CLK_33:        timings = 0x00911030;   break;
-                                case PCI_CLK_48:        timings = 0x00922140;   break;
-                                case PCI_CLK_66:        timings = 0x00923261;   break;
-                        }
-                        break;
-                case XFER_MW_DMA_0:
-                        switch (pci_clock) {
-                                case PCI_CLK_33:        timings = 0x00077771;   break;
-                                case PCI_CLK_48:        timings = 0x000bbbb2;   break;
-                                case PCI_CLK_66:        timings = 0x000ffff3;   break;
-                        }
-                        break;
-                case XFER_MW_DMA_1:
-                        switch (pci_clock) {
-                                case PCI_CLK_33:        timings = 0x00012121;   break;
-                                case PCI_CLK_48:        timings = 0x00024241;   break;
-                                case PCI_CLK_66:        timings = 0x00035352;   break;
-                        }
-                        break;
-                case XFER_MW_DMA_2:
-                        switch (pci_clock) {
-                                case PCI_CLK_33:        timings = 0x00002020;   break;
-                                case PCI_CLK_48:        timings = 0x00013131;   break;
-                                case PCI_CLK_66:        timings = 0x00015151;   break;
-                        }
-                        break;
-                default:
-                        return;
-        }
+
+        if (mode >= XFER_UDMA_0)
+                timings =  udma_timing[pci_clock][mode - XFER_UDMA_0];
+        else
+                timings = mwdma_timing[pci_clock][mode - XFER_MW_DMA_0];
 
         if (unit == 0) {                        /* are we configuring drive0? */
                 pci_read_config_dword(hwif->pci_dev, basereg+4, &reg);
@@ -260,66 +230,39 @@ static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio)
 }
 
 #ifdef CONFIG_PM
-static ide_hwif_t *lookup_pci_dev (ide_hwif_t *prev, struct pci_dev *dev)
-{
-        int     h;
-
-        for (h = 0; h < MAX_HWIFS; h++) {
-                ide_hwif_t *hwif = &ide_hwifs[h];
-                if (prev) {
-                        if (hwif == prev)
-                                prev = NULL;    // found previous, now look for next match
-                } else {
-                        if (hwif && hwif->pci_dev == dev)
-                                return hwif;    // found next match
-                }
-        }
-        return NULL;    // not found
-}
-
-typedef struct sc1200_saved_state_s {
-        __u32           regs[4];
-} sc1200_saved_state_t;
-
+struct sc1200_saved_state {
+        u32 regs[8];
+};
 
 static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
 {
-        ide_hwif_t              *hwif = NULL;
-
         printk("SC1200: suspend(%u)\n", state.event);
 
+        /*
+         * we only save state when going from full power to less
+         */
         if (state.event == PM_EVENT_ON) {
-                // we only save state when going from full power to less
-
-                //
-                // Loop over all interfaces that are part of this PCI device:
-                //
-                while ((hwif = lookup_pci_dev(hwif, dev)) != NULL) {
-                        sc1200_saved_state_t    *ss;
-                        unsigned int            basereg, r;
-                        //
-                        // allocate a permanent save area, if not already allocated
-                        //
-                        ss = (sc1200_saved_state_t *)hwif->config_data;
-                        if (ss == NULL) {
-                                ss = kmalloc(sizeof(sc1200_saved_state_t), GFP_KERNEL);
-                                if (ss == NULL)
-                                        return -ENOMEM;
-                                hwif->config_data = (unsigned long)ss;
-                        }
-                        ss = (sc1200_saved_state_t *)hwif->config_data;
-                        //
-                        // Save timing registers:  this may be unnecessary if 
-                        // BIOS also does it
-                        //
-                        basereg = hwif->channel ? 0x50 : 0x40;
-                        for (r = 0; r < 4; ++r) {
-                                pci_read_config_dword (hwif->pci_dev, basereg + (r<<2), &ss->regs[r]);
-                        }
+                struct sc1200_saved_state *ss;
+                unsigned int r;
+
+                /*
+                 * allocate a permanent save area, if not already allocated
+                 */
+                ss = (struct sc1200_saved_state *)pci_get_drvdata(dev);
+                if (ss == NULL) {
+                        ss = kmalloc(sizeof(*ss), GFP_KERNEL);
+                        if (ss == NULL)
+                                return -ENOMEM;
+                        pci_set_drvdata(dev, ss);
                 }
-        }
 
-        /* You don't need to iterate over disks -- sysfs should have done that for you already */ 
+                /*
+                 * save timing registers
+                 * (this may be unnecessary if BIOS also does it)
+                 */
+                for (r = 0; r < 8; r++)
+                        pci_read_config_dword(dev, 0x40 + r * 4, &ss->regs[r]);
+        }
 
         pci_disable_device(dev);
         pci_set_power_state(dev, pci_choose_state(dev, state));
@@ -328,30 +271,25 @@ static int sc1200_suspend (struct pci_dev *dev, pm_message_t state)
 
 static int sc1200_resume (struct pci_dev *dev)
 {
-        ide_hwif_t      *hwif = NULL;
-        int             i;
+        struct sc1200_saved_state *ss;
+        unsigned int r;
+        int i;
 
         i = pci_enable_device(dev);
         if (i)
                 return i;
 
-        //
-        // loop over all interfaces that are part of this pci device:
-        //
-        while ((hwif = lookup_pci_dev(hwif, dev)) != NULL) {
-                unsigned int            basereg, r;
-                sc1200_saved_state_t    *ss = (sc1200_saved_state_t *)hwif->config_data;
-
-                //
-                // Restore timing registers:  this may be unnecessary if BIOS also does it
-                //
-                basereg = hwif->channel ? 0x50 : 0x40;
-                if (ss != NULL) {
-                        for (r = 0; r < 4; ++r) {
-                                pci_write_config_dword(hwif->pci_dev, basereg + (r<<2), ss->regs[r]);
-                        }
-                }
+        ss = (struct sc1200_saved_state *)pci_get_drvdata(dev);
+
+        /*
+         * restore timing registers
+         * (this may be unnecessary if BIOS also does it)
+         */
+        if (ss) {
+                for (r = 0; r < 8; r++)
+                        pci_write_config_dword(dev, 0x40 + r * 4, ss->regs[r]);
         }
+
         return 0;
 }
 #endif