Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into...

[sfrench/cifs-2.6.git] / drivers / ide / pci / cy82c693.c

diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index efc20bd97fd51bbdfb52cc53e44c7a6ced952797..724cbacf4e5b04d9a82e19e5ea05a0d6e0cf5292 100644 (file)
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -1,6 +1,4 @@
 /*
- * linux/drivers/ide/pci/cy82c693.c            Version 0.41    Aug 27, 2007
- *
  *  Copyright (C) 1998-2000 Andreas S. Krebs (akrebs@altavista.net), Maintainer
  *  Copyright (C) 1998-2002 Andre Hedrick <andre@linux-ide.org>, Integrator
  *
@@ -47,7 +45,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/pci.h>
-#include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/init.h>
 
@@ -176,17 +173,12 @@ static void compute_clocks (u8 pio, pio_clocks_t *p_pclk)
  * set DMA mode a specific channel for CY82C693
  */
 
-static void cy82c693_dma_enable (ide_drive_t *drive, int mode, int single)
+static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
-       u8 index = 0, data = 0;
+       ide_hwif_t *hwif = drive->hwif;
+       u8 single = (mode & 0x10) >> 4, index = 0, data = 0;
 
-       if (mode>2)     /* make sure we set a valid mode */
-               mode = 2;
-                          
-       if (mode > drive->id->tDMA)  /* to be absolutly sure we have a valid mode */
-               mode = drive->id->tDMA;
-       
-       index = (HWIF(drive)->channel==0) ? CY82_INDEX_CHANNEL0 : CY82_INDEX_CHANNEL1;
+       index = hwif->channel ? CY82_INDEX_CHANNEL1 : CY82_INDEX_CHANNEL0;
 
 #if CY82C693_DEBUG_LOGS
        /* for debug let's show the previous values */
@@ -199,7 +191,7 @@ static void cy82c693_dma_enable (ide_drive_t *drive, int mode, int single)
                (data&0x3), ((data>>2)&1));
 #endif /* CY82C693_DEBUG_LOGS */
 
-       data = (u8)mode|(u8)(single<<2);
+       data = (mode & 3) | (single << 2);
 
        outb(index, CY82_INDEX_PORT);
        outb(data, CY82_DATA_PORT);
@@ -207,7 +199,7 @@ static void cy82c693_dma_enable (ide_drive_t *drive, int mode, int single)
 #if CY82C693_DEBUG_INFO
        printk(KERN_INFO "%s (ch=%d, dev=%d): set DMA mode to %d (single=%d)\n",
                drive->name, HWIF(drive)->channel, drive->select.b.unit,
-               mode, single);
+               mode & 3, single);
 #endif /* CY82C693_DEBUG_INFO */
 
        /* 
@@ -230,43 +222,10 @@ static void cy82c693_dma_enable (ide_drive_t *drive, int mode, int single)
 #endif /* CY82C693_DEBUG_INFO */
 }
 
-/* 
- * used to set DMA mode for CY82C693 (single and multi modes)
- */
-static int cy82c693_ide_dma_on (ide_drive_t *drive)
-{
-       struct hd_driveid *id = drive->id;
-
-#if CY82C693_DEBUG_INFO
-       printk (KERN_INFO "dma_on: %s\n", drive->name);
-#endif /* CY82C693_DEBUG_INFO */
-
-       if (id != NULL) {               
-               /* Enable DMA on any drive that has DMA
-                * (multi or single) enabled
-                */
-               if (id->field_valid & 2) {      /* regular DMA */
-                       int mmode, smode;
-
-                       mmode = id->dma_mword & (id->dma_mword >> 8);
-                       smode = id->dma_1word & (id->dma_1word >> 8);
-                                             
-                       if (mmode != 0) {
-                               /* enable multi */
-                               cy82c693_dma_enable(drive, (mmode >> 1), 0);
-                       } else if (smode != 0) {
-                               /* enable single */
-                               cy82c693_dma_enable(drive, (smode >> 1), 1);
-                       }
-               }
-       }
-        return __ide_dma_on(drive);
-}
-
 static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
        ide_hwif_t *hwif = HWIF(drive);
-       struct pci_dev *dev = hwif->pci_dev;
+       struct pci_dev *dev = to_pci_dev(hwif->dev);
        pio_clocks_t pclk;
        unsigned int addrCtrl;
 
@@ -428,20 +387,16 @@ static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const c
  */
 static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif)
 {
-       hwif->chipset = ide_cy82c693;
        hwif->set_pio_mode = &cy82c693_set_pio_mode;
-
-       if (hwif->dma_base == 0)
-               return;
-
-       hwif->ide_dma_on = &cy82c693_ide_dma_on;
+       hwif->set_dma_mode = &cy82c693_set_dma_mode;
 }
 
-static __devinitdata ide_hwif_t *primary;
-
 static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
 {
-       if (PCI_FUNC(hwif->pci_dev->devfn) == 1)
+       static ide_hwif_t *primary;
+       struct pci_dev *dev = to_pci_dev(hwif->dev);
+
+       if (PCI_FUNC(dev->devfn) == 1)
                primary = hwif;
        else {
                hwif->mate = primary;
@@ -449,16 +404,17 @@ static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
        }
 }
 
-static ide_pci_device_t cy82c693_chipset __devinitdata = {
+static const struct ide_port_info cy82c693_chipset __devinitdata = {
        .name           = "CY82C693",
        .init_chipset   = init_chipset_cy82c693,
        .init_iops      = init_iops_cy82c693,
        .init_hwif      = init_hwif_cy82c693,
-       .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_TRUST_BIOS_FOR_DMA |
+       .chipset        = ide_cy82c693,
+       .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_CY82C693 |
                          IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO4,
-       .swdma_mask     = ATA_SWDMA2_ONLY,
-       .mwdma_mask     = ATA_MWDMA2_ONLY,
+       .swdma_mask     = ATA_SWDMA2,
+       .mwdma_mask     = ATA_MWDMA2,
 };
 
 static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_device_id *id)