diff options
-rw-r--r-- | drivers/ata/pata_sil680.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c index b7dfb959fa9e..9b645c5ec955 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c | |||
@@ -35,6 +35,8 @@ | |||
35 | #define DRV_NAME "pata_sil680" | 35 | #define DRV_NAME "pata_sil680" |
36 | #define DRV_VERSION "0.4.6" | 36 | #define DRV_VERSION "0.4.6" |
37 | 37 | ||
38 | #define SIL680_MMIO_BAR 5 | ||
39 | |||
38 | /** | 40 | /** |
39 | * sil680_selreg - return register base | 41 | * sil680_selreg - return register base |
40 | * @hwif: interface | 42 | * @hwif: interface |
@@ -293,8 +295,8 @@ static u8 sil680_init_chip(struct pci_dev *pdev) | |||
293 | 295 | ||
294 | pci_read_config_byte(pdev, 0x8A, &tmpbyte); | 296 | pci_read_config_byte(pdev, 0x8A, &tmpbyte); |
295 | 297 | ||
296 | printk(KERN_INFO "sil680: BA5_EN = %d clock = %02X\n", | 298 | dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n", |
297 | tmpbyte & 1, tmpbyte & 0x30); | 299 | tmpbyte & 1, tmpbyte & 0x30); |
298 | 300 | ||
299 | switch(tmpbyte & 0x30) { | 301 | switch(tmpbyte & 0x30) { |
300 | case 0x00: | 302 | case 0x00: |
@@ -315,8 +317,8 @@ static u8 sil680_init_chip(struct pci_dev *pdev) | |||
315 | } | 317 | } |
316 | 318 | ||
317 | pci_read_config_byte(pdev, 0x8A, &tmpbyte); | 319 | pci_read_config_byte(pdev, 0x8A, &tmpbyte); |
318 | printk(KERN_INFO "sil680: BA5_EN = %d clock = %02X\n", | 320 | dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n", |
319 | tmpbyte & 1, tmpbyte & 0x30); | 321 | tmpbyte & 1, tmpbyte & 0x30); |
320 | 322 | ||
321 | pci_write_config_byte(pdev, 0xA1, 0x72); | 323 | pci_write_config_byte(pdev, 0xA1, 0x72); |
322 | pci_write_config_word(pdev, 0xA2, 0x328A); | 324 | pci_write_config_word(pdev, 0xA2, 0x328A); |
@@ -339,7 +341,8 @@ static u8 sil680_init_chip(struct pci_dev *pdev) | |||
339 | return tmpbyte & 0x30; | 341 | return tmpbyte & 0x30; |
340 | } | 342 | } |
341 | 343 | ||
342 | static int sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id) | 344 | static int __devinit sil680_init_one(struct pci_dev *pdev, |
345 | const struct pci_device_id *id) | ||
343 | { | 346 | { |
344 | static const struct ata_port_info info = { | 347 | static const struct ata_port_info info = { |
345 | .sht = &sil680_sht, | 348 | .sht = &sil680_sht, |