Skip to contentSkip to conversation

staging: i4l: act2000: Fix multiple checkpatch warnings

PATCH Superseded sayli karnik 2 participants 6 messages Sep 19, 2016 – Sep 20, 2016 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

sayli karnik

author
#0 lore raw

cover staging: i4l: act2000: Fix multiple checkpatch warnings

This patchset fixes multiple checkpatch.pl warnings.

sayli karnik (4):
Replace printk(KERN_WARNING..) with netdev_warn(dev, ..) Correct the spelling for resources
Add a blank line after declarations
Replace explicit NULL comparison with ! operator

 drivers/staging/i4l/act2000/act2000_isa.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/4 staging: i4l: act2000: Replace printk(KERN_WARNING..) with netdev_warn(dev, ..)

This patch fixes the checkpatch warning:
WARNING: Prefer [subsystem eg: netdev]_warn([subsystem]dev, ... then dev_warn(dev, ... then pr_warn(... to printk(KERN_WARNING ...

Signed-off-by sayli karnik <[email protected]>
---
 drivers/staging/i4l/act2000/act2000_isa.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/staging/i4l/act2000/act2000_isa.c +9 -11
index 1d93151..c325fae9 100644
@@ -78,7 +78,7 @@ act2000_isa_interrupt(int dummy, void *dev_id)
 	if (istatus & ISA_ISR_ERR) {
 		/* Error Interrupt */
 		istatus &= ISA_ISR_ERR_MASK;
-		printk(KERN_WARNING "act2000: errIRQ\n");
+		netdev_warn(dev, "act2000: errIRQ\n");
 	}
 	if (istatus)
 		printk(KERN_DEBUG "act2000: ?IRQ %d %02x\n", card->irq, istatus);

@@ -147,8 +147,7 @@ act2000_isa_config_irq(act2000_card *card, short irq)
 	if (request_irq(irq, &act2000_isa_interrupt, 0, card->regname, card)) {
 		card->irq = old_irq;
 		card->flags |= ACT2000_FLAGS_IVALID;
-		printk(KERN_WARNING
-		       "act2000: Could not request irq %d\n", irq);
+		netdev_warn(dev, "act2000: Could not request irq %d\n", irq);
 		return -EBUSY;
 	} else {
 		act2000_isa_select_irq(card);

@@ -246,7 +245,7 @@ act2000_isa_receive(act2000_card *card)
 					card->idat.isa.rcvskb = dev_alloc_skb(card->idat.isa.rcvlen);
 					if (card->idat.isa.rcvskb == NULL) {
 						card->idat.isa.rcvignore = 1;
-						printk(KERN_WARNING
+						netdev_warn(dev,
 						       "act2000_isa_receive: no memory\n");
 						test_and_clear_bit(ACT2000_LOCK_RX, (void *)&card->ilock);
 						return;

@@ -255,13 +254,13 @@ act2000_isa_receive(act2000_card *card)
 					card->idat.isa.rcvptr = skb_put(card->idat.isa.rcvskb, card->idat.isa.rcvlen - 8);
 				} else {
 					card->idat.isa.rcvidx = 0;
-					printk(KERN_WARNING
+					netdev_warn(dev,
 					       "act2000_isa_receive: Invalid CAPI msg\n");
 					{
 						int i; __u8 *p; __u8 *t; __u8 tmp[30];
 						for (i = 0, p = (__u8 *)&card->idat.isa.rcvhdr, t = tmp; i < 8; i++)
 							t += sprintf(t, "%02x ", *(p++));
-						printk(KERN_WARNING "act2000_isa_receive: %s\n", tmp);
+						netdev_warn(dev, "act2000_isa_receive: %s\n", tmp);
 					}
 				}
 			}

@@ -370,13 +369,13 @@ act2000_isa_getid(act2000_card *card)
 		count++;
 	}
 	if (count <= 20) {
-		printk(KERN_WARNING "act2000: No Firmware-ID!\n");
+		netdev_warn(dev, "act2000: No Firmware-ID!\n");
 		return -ETIME;
 	}
 	*p = '\0';
 	fid.revlen[0] = '\0';
 	if (strcmp(fid.isdn, "ISDN")) {
-		printk(KERN_WARNING "act2000: Wrong Firmware-ID!\n");
+		netdev_warn(dev, "act2000: Wrong Firmware-ID!\n");
 		return -EPROTO;
 	}
 	p = strchr(fid.revision, '\n');

@@ -428,9 +427,8 @@ act2000_isa_download(act2000_card *card, act2000_ddef __user *cb)
 		}
 		while (c < l) {
 			if (act2000_isa_writeb(card, *b++)) {
-				printk(KERN_WARNING
-				       "act2000: loader timed out"
-				       " len=%d c=%d\n", length, c);
+				netdev_warn(dev, "act2000: loader timed out len=%d c=%d\n",
+					     length, c);
 				kfree(buf);
 				return -ETIME;
 			}
Signature · 1 line
2.7.4
maintainer
#2 lore raw

Re: [PATCH 1/4] staging: i4l: act2000: Replace printk(KERN_WARNING..) with netdev_warn(dev, ..)

Quoted 8 lines · sayli karnik

This patch fixes the checkpatch warning:
WARNING: Prefer [subsystem eg: netdev]_warn([subsystem]dev, ... then dev_warn(dev, ... then pr_warn(... to printk(KERN_WARNING ...

Signed-off-by sayli karnik <[email protected]>
---
 drivers/staging/i4l/act2000/act2000_isa.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

This series doesn't apply to the tree at all, can you refresh and rebase and resend?

thanks,

greg k-h

author
#3 lore raw

PATCH 2/4 staging: i4l: act2000: Correct the spelling for resources

In reply to sayli karnik

This patch replaces 'ressources' with 'resources' as detected by checkpatch.pl.

Signed-off-by sayli karnik <[email protected]>
---
 drivers/staging/i4l/act2000/act2000_isa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/i4l/act2000/act2000_isa.c +1 -1
index c325fae9..bd45d18 100644
@@ -175,7 +175,7 @@ act2000_isa_config_port(act2000_card *card, unsigned short portbase)
 }
 
 /*
- * Release ressources, used by an adaptor.
+ * Release resources, used by an adaptor.
  */
 void
 act2000_isa_release(act2000_card *card)
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH 3/4 staging: i4l: act2000: Add a blank line after declarations

In reply to sayli karnik

This patch fixes the following checkpatch.pl warning:
WARNING: Missing a blank line after declarations

Signed-off-by sayli karnik <[email protected]>
---
 drivers/staging/i4l/act2000/act2000_isa.c | 1 +
 1 file changed, 1 insertion(+)
drivers/staging/i4l/act2000/act2000_isa.c +1 -0
index bd45d18..4114e17 100644
@@ -258,6 +258,7 @@ act2000_isa_receive(act2000_card *card)
 					       "act2000_isa_receive: Invalid CAPI msg\n");
 					{
 						int i; __u8 *p; __u8 *t; __u8 tmp[30];
+
 						for (i = 0, p = (__u8 *)&card->idat.isa.rcvhdr, t = tmp; i < 8; i++)
 							t += sprintf(t, "%02x ", *(p++));
 						netdev_warn(dev, "act2000_isa_receive: %s\n", tmp);
Signature · 1 line
2.7.4
author
#5 lore raw

PATCH 4/4 staging: i4l: act2000: Replace explicit NULL comparison with ! operator

In reply to sayli karnik

This patch replaces the explicit NULL comparisons with ! operator. Done using Coccinelle:

@disable is_null@
expression e;
@@
- e == NULL
+ !e

Signed-off-by sayli karnik <[email protected]>
---
 drivers/staging/i4l/act2000/act2000_isa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/i4l/act2000/act2000_isa.c +2 -2
index 4114e17..ed61623 100644
@@ -165,7 +165,7 @@ act2000_isa_config_port(act2000_card *card, unsigned short portbase)
 		release_region(card->port, ISA_REGION);
 		card->flags &= ~ACT2000_FLAGS_PVALID;
 	}
-	if (request_region(portbase, ACT2000_PORTLEN, card->regname) == NULL)
+	if (!request_region(portbase, ACT2000_PORTLEN, card->regname))
 		return -EBUSY;
 	else {
 		card->port = portbase;

@@ -243,7 +243,7 @@ act2000_isa_receive(act2000_card *card)
 				if (valid) {
 					card->idat.isa.rcvlen = ((actcapi_msghdr *)&card->idat.isa.rcvhdr)->len;
 					card->idat.isa.rcvskb = dev_alloc_skb(card->idat.isa.rcvlen);
-					if (card->idat.isa.rcvskb == NULL) {
+					if (!card->idat.isa.rcvskb) {
 						card->idat.isa.rcvignore = 1;
 						netdev_warn(dev,
 						       "act2000_isa_receive: no memory\n");
Signature · 1 line
2.7.4