lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pata_sil680: minor CodingStyle fixups

Browse Source 
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2011-10-11 20:21:50 +02:00
committed by Jeff Garzik
parent 9b8ad4ac79
commit 7a113d3840
1 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/ata/pata_sil680.c
View File

@@ -82,7 +82,8 @@ static unsigned long sil680_seldev(struct ata_port *ap, struct ata_device *adev,
* space for us. * space for us.
*/ */
static int sil680_cable_detect(struct ata_port *ap) { static int sil680_cable_detect(struct ata_port *ap)
{
struct pci_dev *pdev = to_pci_dev(ap->host->dev); struct pci_dev *pdev = to_pci_dev(ap->host->dev);
unsigned long addr = sil680_selreg(ap, 0); unsigned long addr = sil680_selreg(ap, 0);
u8 ata66; u8 ata66;
@@ -181,7 +182,7 @@ static void sil680_set_dmamode(struct ata_port *ap, struct ata_device *adev)
mode &= ~(0x03 << port_shift); mode &= ~(0x03 << port_shift);
/* Extract scsc */ /* Extract scsc */
scsc = (scsc & 0x30) ? 1: 0; scsc = (scsc & 0x30) ? 1 : 0;
if (adev->dma_mode >= XFER_UDMA_0) { if (adev->dma_mode >= XFER_UDMA_0) {
multi = 0x10C1; multi = 0x10C1;
@@ -254,7 +255,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
{ {
u8 tmpbyte = 0; u8 tmpbyte = 0;
/* FIXME: double check */ /* FIXME: double check */
pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE,
pdev->revision ? 1 : 255); pdev->revision ? 1 : 255);
@@ -272,22 +273,22 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
*try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5); *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
#endif #endif
switch(tmpbyte & 0x30) { switch (tmpbyte & 0x30) {
case 0x00: case 0x00:
/* 133 clock attempt to force it on */ /* 133 clock attempt to force it on */
pci_write_config_byte(pdev, 0x8A, tmpbyte|0x10); pci_write_config_byte(pdev, 0x8A, tmpbyte|0x10);
break; break;
case 0x30: case 0x30:
/* if clocking is disabled */ /* if clocking is disabled */
/* 133 clock attempt to force it on */ /* 133 clock attempt to force it on */
pci_write_config_byte(pdev, 0x8A, tmpbyte & ~0x20); pci_write_config_byte(pdev, 0x8A, tmpbyte & ~0x20);
break; break;
case 0x10: case 0x10:
/* 133 already */ /* 133 already */
break; break;
case 0x20: case 0x20:
/* BIOS set PCI x2 clocking */ /* BIOS set PCI x2 clocking */
break; break;
} }
pci_read_config_byte(pdev, 0x8A, &tmpbyte); pci_read_config_byte(pdev, 0x8A, &tmpbyte);
@@ -305,12 +306,19 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
pci_write_config_dword(pdev, 0xB8, 0x43924392); pci_write_config_dword(pdev, 0xB8, 0x43924392);
pci_write_config_dword(pdev, 0xBC, 0x40094009); pci_write_config_dword(pdev, 0xBC, 0x40094009);
switch(tmpbyte & 0x30) { switch (tmpbyte & 0x30) {
case 0x00: printk(KERN_INFO "sil680: 100MHz clock.\n");break; case 0x00:
case 0x10: printk(KERN_INFO "sil680: 133MHz clock.\n");break; printk(KERN_INFO "sil680: 100MHz clock.\n");
case 0x20: printk(KERN_INFO "sil680: Using PCI clock.\n");break; break;
/* This last case is _NOT_ ok */ case 0x10:
case 0x30: printk(KERN_ERR "sil680: Clock disabled ?\n"); printk(KERN_INFO "sil680: 133MHz clock.\n");
break;
case 0x20:
printk(KERN_INFO "sil680: Using PCI clock.\n");
break;
/* This last case is _NOT_ ok */
case 0x30:
printk(KERN_ERR "sil680: Clock disabled ?\n");
} }
return tmpbyte & 0x30; return tmpbyte & 0x30;
} }