Commit eb856202 authored Mar 06, 2015 by Haneen Mohammed Committed by Greg Kroah-Hartman Mar 06, 2015

Staging: slicoss: clean dev_err logging



This patch removes  __func__ from dev_err. dev_err includes information about:
(devcice, driver, specific instance of device, etc) in the log printout.
This was done using Coccinelle, with the following semantic patch:

@a@
expression E, R;
expression  msg;
@@

dev_err(E, msg, __func__, R);

@script:python b@
e << a.msg;
y;
@@

if(e.find("%s: ") == True):
	m = e.replace("%s: ", "", 1);
	coccinelle.y = m;
elif(e.find("%s ") == True):
	m = e.replace("%s ", "", 1);
	coccinelle.y = m;
elif(e.find("%s:") == True):
	m = e.replace("%s:", "", 1);
	coccinelle.y = m;
else:
	m = e.replace("%s", "",1);
	coccinelle.y = m;

@c@
expression a.E, a.msg, a.R;
identifier  b.y;
@@

- dev_err(E, msg, __func__, R);
+ dev_err(E, y, R);

Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3daf9df3

drivers/staging/slicoss/slicoss.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -2313,9 +2313,8 @@ static int slic_if_init(struct adapter *adapter)
		}
		rc = slic_adapter_allocresources(adapter);
		if (rc) {
		dev_err(&dev->dev,
		"%s: slic_adapter_allocresources FAILED %x\n",
		__func__, rc);
		dev_err(&dev->dev, "slic_adapter_allocresources FAILED %x\n",
		rc);
		slic_adapter_freeresources(adapter);
		goto err;
		}
		@@ -2549,8 +2548,8 @@ static int slic_ioctl(struct net_device dev, struct ifreq rq, int cmd)
		if (copy_from_user(data, rq->ifr_data, 28))
		return -EFAULT;
		intagg = data[0];
		dev_err(&dev->dev, "%s: set interrupt aggregation to %d\n",
		__func__, intagg);
		dev_err(&dev->dev, "set interrupt aggregation to %d\n",
		intagg);
		slic_intagg_set(adapter, intagg);
		return 0;