isdn: fix misspelling of current function in string

JuliaLawall · davem330 · commit eeb4e6d16672 · 2014-12-09T16:18:46.000-05:00
Replace a misspelled function name by %s and then __func__.

In the first case, the print is just dropped, because kmalloc itself does
enough error reporting.

This was done using Coccinelle, including the use of Levenshtein distance,
as proposed by Rasmus Villemoes.

Signed-off-by: Julia Lawall &lt;Julia.Lawall@lip6.fr&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c
@@ -31,7 +31,7 @@ WaitForBusy(struct IsdnCardState *cs)
 		to--;
 	}
 	if (!to) {
-		printk(KERN_WARNING "HiSax: waitforBusy timeout\n");
+		printk(KERN_WARNING "HiSax: %s timeout\n", __func__);
 		return (0);
 	} else
 		return (to);
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c
@@ -1159,7 +1159,8 @@ hfcsx_l2l1(struct PStack *st, int pr, void *arg)
 	case (PH_PULL | INDICATION):
 		spin_lock_irqsave(&bcs->cs->lock, flags);
 		if (bcs->tx_skb) {
-			printk(KERN_WARNING "hfc_l2l1: this shouldn't happen\n");
+			printk(KERN_WARNING "%s: this shouldn't happen\n",
+			       __func__);
 		} else {
 //				test_and_set_bit(BC_FLG_BUSY, &bcs->Flag);
 			bcs->tx_skb = skb;
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
@@ -927,9 +927,8 @@ start_int_fifo(usb_fifo *fifo)
 	fifo->active = 1;	/* must be marked active */
 	errcode = usb_submit_urb(fifo->urb, GFP_KERNEL);
 	if (errcode) {
-		printk(KERN_ERR
-		       "HFC-S USB: submit URB error(start_int_info): status:%i\n",
-		       errcode);
+		printk(KERN_ERR "HFC-S USB: submit URB error(%s): status:%i\n",
+		       __func__, errcode);
 		fifo->active = 0;
 		fifo->skbuff = NULL;
 	}
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c
@@ -580,7 +580,7 @@ bch_fill_fifo(struct BCState *bcs)
 	if (cs->debug & L1_DEB_HSCX_FIFO) {
 		char *t = bcs->blog;
 
-		t += sprintf(t, "chb_fill_fifo() B-%d cnt %d", hscx, count);
+		t += sprintf(t, "%s() B-%d cnt %d", __func__, hscx, count);
 		QuickHex(t, ptr, count);
 		debugl1(cs, "%s", bcs->blog);
 	}
diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c
@@ -867,7 +867,7 @@ l1_msg(struct IsdnCardState *cs, int pr, void *arg) {
 			break;
 		default:
 			if (cs->debug)
-				debugl1(cs, "l1msg %04X unhandled", pr);
+				debugl1(cs, "%s %04X unhandled", __func__, pr);
 			break;
 		}
 		st = st->next;
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c
@@ -153,7 +153,7 @@ void
 newl3state(struct l3_process *pc, int state)
 {
 	if (pc->debug & L3_DEB_STATE)
-		l3_debug(pc->st, "newstate cr %d %d --> %d",
+		l3_debug(pc->st, "%s cr %d %d --> %d", __func__,
 			 pc->callref & 0x7F,
 			 pc->state, state);
 	pc->state = state;
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
@@ -501,7 +501,7 @@ static char *hycapi_procinfo(struct capi_ctr *ctrl)
 {
 	hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata);
 #ifdef HYCAPI_PRINTFNAMES
-	printk(KERN_NOTICE "hycapi_proc_info\n");
+	printk(KERN_NOTICE "%s\n", __func__);
 #endif
 	if (!cinfo)
 		return "";
diff --git a/drivers/isdn/pcbit/layer2.c b/drivers/isdn/pcbit/layer2.c
@@ -85,7 +85,6 @@ pcbit_l2_write(struct pcbit_dev *dev, ulong msg, ushort refnum,
 	}
 	if ((frame = kmalloc(sizeof(struct frame_buf),
 			     GFP_ATOMIC)) == NULL) {
-		printk(KERN_WARNING "pcbit_2_write: kmalloc failed\n");
 		dev_kfree_skb(skb);
 		return -1;
 	}

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ WaitForBusy(struct IsdnCardState *cs)`
`31`	`31`	`to--;`
`32`	`32`	`}`
`33`	`33`	`if (!to) {`
`34`		`- printk(KERN_WARNING "HiSax: waitforBusy timeout\n");`
	`34`	`+ printk(KERN_WARNING "HiSax: %s timeout\n", __func__);`
`35`	`35`	`return (0);`
`36`	`36`	`} else`
`37`	`37`	`return (to);`
Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,7 @@ bch_fill_fifo(struct BCState *bcs)`
`580`	`580`	`if (cs->debug & L1_DEB_HSCX_FIFO) {`
`581`	`581`	`char *t = bcs->blog;`
`582`	`582`
`583`		`- t += sprintf(t, "chb_fill_fifo() B-%d cnt %d", hscx, count);`
	`583`	`+ t += sprintf(t, "%s() B-%d cnt %d", __func__, hscx, count);`
`584`	`584`	`QuickHex(t, ptr, count);`
`585`	`585`	`debugl1(cs, "%s", bcs->blog);`
`586`	`586`	`}`
Original file line number	Diff line number	Diff line change
`@@ -867,7 +867,7 @@ l1_msg(struct IsdnCardState cs, int pr, void arg) {`
`867`	`867`	`break;`
`868`	`868`	`default:`
`869`	`869`	`if (cs->debug)`
`870`		`- debugl1(cs, "l1msg %04X unhandled", pr);`
	`870`	`+ debugl1(cs, "%s %04X unhandled", __func__, pr);`
`871`	`871`	`break;`
`872`	`872`	`}`
`873`	`873`	`st = st->next;`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ void`
`153`	`153`	`newl3state(struct l3_process *pc, int state)`
`154`	`154`	`{`
`155`	`155`	`if (pc->debug & L3_DEB_STATE)`
`156`		`- l3_debug(pc->st, "newstate cr %d %d --> %d",`
	`156`	`+ l3_debug(pc->st, "%s cr %d %d --> %d", __func__,`
`157`	`157`	`pc->callref & 0x7F,`
`158`	`158`	`pc->state, state);`
`159`	`159`	`pc->state = state;`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ static char hycapi_procinfo(struct capi_ctr ctrl)`
`501`	`501`	`{`
`502`	`502`	`hycapictrl_info cinfo = (hycapictrl_info )(ctrl->driverdata);`
`503`	`503`	`#ifdef HYCAPI_PRINTFNAMES`
`504`		`- printk(KERN_NOTICE "hycapi_proc_info\n");`
	`504`	`+ printk(KERN_NOTICE "%s\n", __func__);`
`505`	`505`	`#endif`
`506`	`506`	`if (!cinfo)`
`507`	`507`	`return "";`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ pcbit_l2_write(struct pcbit_dev *dev, ulong msg, ushort refnum,`
`85`	`85`	`}`
`86`	`86`	`if ((frame = kmalloc(sizeof(struct frame_buf),`
`87`	`87`	`GFP_ATOMIC)) == NULL) {`
`88`		`- printk(KERN_WARNING "pcbit_2_write: kmalloc failed\n");`
`89`	`88`	`dev_kfree_skb(skb);`
`90`	`89`	`return -1;`
`91`	`90`	`}`