Skip to contentSkip to conversation

pata_sil680: minor CodingStyle fixups

PATCH In review Bartlomiej Zolnierkiewicz 4 participants 5 messages Oct 11, 2011 – Oct 14, 2011 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 3/3 pata_sil680: minor CodingStyle fixups

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] pata_sil680: minor CodingStyle fixups

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ata/pata_sil680.c |   58 ++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 25 deletions(-)
drivers/ata/pata_sil680.c +33 -25
Index: b/drivers/ata/pata_sil680.c
===================================================================
@@ -81,7 +81,8 @@ static unsigned long sil680_seldev(struc
  *	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;

@@ -175,7 +176,7 @@ static void sil680_set_dmamode(struct at
 	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;

@@ -214,7 +215,7 @@ static u8 sil680_init_chip(struct pci_de
 {
 	u8 tmpbyte	= 0;
 
-        /* FIXME: double check */
+	/* FIXME: double check */
 	pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE,
 			      pdev->revision ? 1 : 255);
 

@@ -232,22 +233,22 @@ static u8 sil680_init_chip(struct pci_de
 		*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);

@@ -265,12 +266,19 @@ static u8 sil680_init_chip(struct pci_de
 	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;
 }
#2 lore raw
In reply to Bartlomiej Zolnierkiewicz

Hello.

Quoted 12 lines · Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz<[email protected]>
Subject: [PATCH] pata_sil680: minor CodingStyle fixups

Signed-off-by Bartlomiej Zolnierkiewicz<[email protected]>
---
  drivers/ata/pata_sil680.c |   58 ++++++++++++++++++++++++++--------------------
  1 file changed, 33 insertions(+), 25 deletions(-)

Index: b/drivers/ata/pata_sil680.c
===================================================================

drivers/ata/pata_sil680.c +0 -0

[...]

Quoted 10 lines
drivers/ata/pata_sil680.c +0 -6
@@ -265,12 +266,19 @@ static u8 sil680_init_chip(struct pci_de
  	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");

drivers/ata/pata_sil680.c static u8 sil680_init_chip(struct pci_de · line 278

Quoted 10 lines
drivers/ata/pata_sil680.c +10 -0
+	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;

pr_info() here and above?

drivers/ata/pata_sil680.c static u8 sil680_init_chip(struct pci_de · line 281

Quoted 3 lines
drivers/ata/pata_sil680.c +3 -0
+	/* This last case is _NOT_ ok */
+	case 0x30:
+		printk(KERN_ERR "sil680: Clock disabled ?\n");

pr_err()? Or checkpatch.pl doesn't complain about it (I forgot)?

WBR, Sergei

#3 lore raw
Quoted 7 lines

drivers/ata/pata_sil680.c static u8 sil680_init_chip(struct pci_de · line 281

Quoted 5 lines
drivers/ata/pata_sil680.c +3 -0
+	/* This last case is _NOT_ ok */
+	case 0x30:
+		printk(KERN_ERR "sil680: Clock disabled ?\n");

pr_err()? Or checkpatch.pl doesn't complain about it (I forgot)?

dev_ would be even better but that seems to be a separate thing. The existing patch is still a move in the right direction.

#4 lore raw
Quoted 10 lines · Alan Cox
Quoted 7 lines

drivers/ata/pata_sil680.c static u8 sil680_init_chip(struct pci_de · line 281

Quoted 5 lines
drivers/ata/pata_sil680.c +3 -0
+	/* This last case is _NOT_ ok */
+	case 0x30:
+		printk(KERN_ERR "sil680: Clock disabled ?\n");

pr_err()? Or checkpatch.pl doesn't complain about it (I forgot)?

dev_ would be even better but that seems to be a separate thing. The existing patch is still a move in the right direction.

agreed x 2

To be specific, it should be

	dev_err(&pdev->dev