1 files changed, 12 insertions, 9 deletions

diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 440e2cb6ee75..b0cd52d6e3fb 100644
--- 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
@@ -293,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:
@@ -315,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);
@@ -339,22 +341,23 @@ 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 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 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
         };
         const struct ata_port_info *ppi[] = { &info, NULL };