S2IO: Removing 3 buffer mode support from the driver

[pandora-kernel.git] / drivers / ata / pata_sil680.c

diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 6770820..b0cd52d 100644 (file)
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -35,6 +35,8 @@
 #define DRV_NAME "pata_sil680"
 #define DRV_VERSION "0.4.6"
 
+#define SIL680_MMIO_BAR                5
+
 /**
  *     sil680_selreg           -       return register base
  *     @hwif: interface
@@ -94,11 +96,13 @@ static int sil680_cable_detect(struct ata_port *ap) {
 /**
  *     sil680_bus_reset        -       reset the SIL680 bus
  *     @ap: ATA port to reset
+ *     @deadline: deadline jiffies for the operation
  *
  *     Perform the SIL680 housekeeping when doing an ATA bus reset
  */
 
-static int sil680_bus_reset(struct ata_port *ap,unsigned int *classes)
+static int sil680_bus_reset(struct ata_port *ap,unsigned int *classes,
+                           unsigned long deadline)
 {
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
        unsigned long addr = sil680_selreg(ap, 0);
@@ -108,7 +112,7 @@ static int sil680_bus_reset(struct ata_port *ap,unsigned int *classes)
        pci_write_config_byte(pdev, addr, reset | 0x03);
        udelay(25);
        pci_write_config_byte(pdev, addr, reset);
-       return ata_std_softreset(ap, classes);
+       return ata_std_softreset(ap, classes, deadline);
 }
 
 static void sil680_error_handler(struct ata_port *ap)
@@ -230,10 +234,6 @@ static struct scsi_host_template sil680_sht = {
        .slave_configure        = ata_scsi_slave_config,
        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
-#ifdef CONFIG_PM
-       .suspend                = ata_scsi_device_suspend,
-       .resume                 = ata_scsi_device_resume,
-#endif
 };
 
 static struct ata_port_operations sil680_port_ops = {
@@ -295,8 +295,8 @@ static u8 sil680_init_chip(struct pci_dev *pdev)
 
        pci_read_config_byte(pdev, 0x8A, &tmpbyte);
 
-       printk(KERN_INFO "sil680: BA5_EN = %d clock = %02X\n",
-                       tmpbyte & 1, tmpbyte & 0x30);
+       dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n",
+               tmpbyte & 1, tmpbyte & 0x30);
 
        switch(tmpbyte & 0x30) {
                case 0x00:
@@ -317,8 +317,8 @@ static u8 sil680_init_chip(struct pci_dev *pdev)
        }
 
        pci_read_config_byte(pdev,   0x8A, &tmpbyte);
-       printk(KERN_INFO "sil680: BA5_EN = %d clock = %02X\n",
-                       tmpbyte & 1, tmpbyte & 0x30);
+       dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n",
+               tmpbyte & 1, tmpbyte & 0x30);
 
        pci_write_config_byte(pdev,  0xA1, 0x72);
        pci_write_config_word(pdev,  0xA2, 0x328A);
@@ -341,25 +341,26 @@ static u8 sil680_init_chip(struct pci_dev *pdev)
        return tmpbyte & 0x30;
 }
 
-static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
+static int __devinit sil680_init_one(struct pci_dev *pdev,
+                                    const struct pci_device_id *id)
 {
-       static struct ata_port_info info = {
+       static const struct ata_port_info info = {
                .sht = &sil680_sht,
-               .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
+               .flags = ATA_FLAG_SLAVE_POSS,
                .pio_mask = 0x1f,
                .mwdma_mask = 0x07,
-               .udma_mask = 0x7f,
+               .udma_mask = ATA_UDMA6,
                .port_ops = &sil680_port_ops
        };
-       static struct ata_port_info info_slow = {
+       static const struct ata_port_info info_slow = {
                .sht = &sil680_sht,
-               .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
+               .flags = ATA_FLAG_SLAVE_POSS,
                .pio_mask = 0x1f,
                .mwdma_mask = 0x07,
-               .udma_mask = 0x3f,
+               .udma_mask = ATA_UDMA5,
                .port_ops = &sil680_port_ops
        };
-       static struct ata_port_info *port_info[2] = {&info, &info};
+       const struct ata_port_info *ppi[] = { &info, NULL };
        static int printed_version;
 
        if (!printed_version++)
@@ -368,12 +369,12 @@ static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
        switch(sil680_init_chip(pdev))
        {
                case 0:
-                       port_info[0] = port_info[1] = &info_slow;
+                       ppi[0] = &info_slow;
                        break;
                case 0x30:
                        return -ENODEV;
        }
-       return ata_pci_init_one(pdev, port_info, 2);
+       return ata_pci_init_one(pdev, ppi);
 }
 
 #ifdef CONFIG_PM