Skip to content

Commit

Permalink
[libata] pata_sil680: minor cleanups from benh
Browse files Browse the repository at this point in the history
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: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Jeff Garzik committed Jul 9, 2007
1 parent b2d46b6 commit 79b0bde
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions drivers/ata/pata_sil680.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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);
Expand All @@ -339,7 +341,8 @@ 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,
Expand Down

0 comments on commit 79b0bde

Please sign in to comment.