Commit 79b0bde1 authored by Jeff Garzik's avatar Jeff Garzik

[libata] pata_sil680: minor cleanups from benh

Merge unrelated cleanups (__devinit, dev_dbg, hardware constant)
from changeset "pata_sil680: Add MMIO support" authored by
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b2d46b61
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#define DRV_NAME "pata_sil680" #define DRV_NAME "pata_sil680"
#define DRV_VERSION "0.4.6" #define DRV_VERSION "0.4.6"
#define SIL680_MMIO_BAR 5
/** /**
* sil680_selreg - return register base * sil680_selreg - return register base
* @hwif: interface * @hwif: interface
...@@ -293,7 +295,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev) ...@@ -293,7 +295,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev)
pci_read_config_byte(pdev, 0x8A, &tmpbyte); pci_read_config_byte(pdev, 0x8A, &tmpbyte);
printk(KERN_INFO "sil680: BA5_EN = %d clock = %02X\n", dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n",
tmpbyte & 1, tmpbyte & 0x30); tmpbyte & 1, tmpbyte & 0x30);
switch(tmpbyte & 0x30) { switch(tmpbyte & 0x30) {
...@@ -315,7 +317,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev) ...@@ -315,7 +317,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev)
} }
pci_read_config_byte(pdev, 0x8A, &tmpbyte); pci_read_config_byte(pdev, 0x8A, &tmpbyte);
printk(KERN_INFO "sil680: BA5_EN = %d clock = %02X\n", dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n",
tmpbyte & 1, tmpbyte & 0x30); tmpbyte & 1, tmpbyte & 0x30);
pci_write_config_byte(pdev, 0xA1, 0x72); pci_write_config_byte(pdev, 0xA1, 0x72);
...@@ -339,7 +341,8 @@ static u8 sil680_init_chip(struct pci_dev *pdev) ...@@ -339,7 +341,8 @@ static u8 sil680_init_chip(struct pci_dev *pdev)
return tmpbyte & 0x30; 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 = { static const struct ata_port_info info = {
.sht = &sil680_sht, .sht = &sil680_sht,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment