]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
pata_sil680: minor CodingStyle fixups
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 11 Oct 2011 18:21:50 +0000 (20:21 +0200)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 14 Oct 2011 16:46:45 +0000 (12:46 -0400)
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/ata/pata_sil680.c

index caa426e6930f1d2a77cfcf4dfd104e2ffc04d3a3..b92eacf8dd3c108ac9a04d89c9a3e53f561c7550 100644 (file)
@@ -82,7 +82,8 @@ static unsigned long sil680_seldev(struct ata_port *ap, struct ata_device *adev,
  *     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);
        unsigned long addr = sil680_selreg(ap, 0);
        u8 ata66;
@@ -181,7 +182,7 @@ static void sil680_set_dmamode(struct ata_port *ap, struct ata_device *adev)
        mode &= ~(0x03 << port_shift);
 
        /* Extract scsc */
-       scsc = (scsc & 0x30) ? 1: 0;
+       scsc = (scsc & 0x30) ? 1 : 0;
 
        if (adev->dma_mode >= XFER_UDMA_0) {
                multi = 0x10C1;
@@ -254,7 +255,7 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
 {
        u8 tmpbyte      = 0;
 
-        /* FIXME: double check */
+       /* FIXME: double check */
        pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE,
                              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);
 #endif
 
-       switch(tmpbyte & 0x30) {
-               case 0x00:
-                       /* 133 clock attempt to force it on */
-                       pci_write_config_byte(pdev, 0x8A, tmpbyte|0x10);
-                       break;
-               case 0x30:
-                       /* if clocking is disabled */
-                       /* 133 clock attempt to force it on */
-                       pci_write_config_byte(pdev, 0x8A, tmpbyte & ~0x20);
-                       break;
-               case 0x10:
-                       /* 133 already */
-                       break;
-               case 0x20:
-                       /* BIOS set PCI x2 clocking */
-                       break;
+       switch (tmpbyte & 0x30) {
+       case 0x00:
+               /* 133 clock attempt to force it on */
+               pci_write_config_byte(pdev, 0x8A, tmpbyte|0x10);
+               break;
+       case 0x30:
+               /* if clocking is disabled */
+               /* 133 clock attempt to force it on */
+               pci_write_config_byte(pdev, 0x8A, tmpbyte & ~0x20);
+               break;
+       case 0x10:
+               /* 133 already */
+               break;
+       case 0x20:
+               /* BIOS set PCI x2 clocking */
+               break;
        }
 
        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, 0xBC, 0x40094009);
 
-       switch(tmpbyte & 0x30) {
-               case 0x00: printk(KERN_INFO "sil680: 100MHz clock.\n");break;
-               case 0x10: 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");
+       switch (tmpbyte & 0x30) {
+       case 0x00:
+               printk(KERN_INFO "sil680: 100MHz clock.\n");
+               break;
+       case 0x10:
+               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;
 }