Commit aed1c72e authored by Haneen Mohammed's avatar Haneen Mohammed Committed by Greg Kroah-Hartman
Browse files

Staging: fbtft: 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: default avatarHaneen Mohammed <hamohammed.sa@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 14f63eee

drivers/staging/fbtft/fb_agm1264k-fl.c

+8 −8
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) 


	if (*buf > 1) {

		va_end(args);

		dev_err(par->info->device, "%s: Incorrect chip sellect request (%d)\n",

			__func__, *buf);

		dev_err(par->info->device,

			"Incorrect chip sellect request (%d)\n", *buf);

		return;

	}
@@ -224,8 +224,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) 
		ret = par->fbtftops.write(par, par->buf, len * (sizeof(u8)));

		if (ret < 0) {

			va_end(args);

			dev_err(par->info->device, "%s: write() failed and returned %d\n",

				__func__, ret);

			dev_err(par->info->device,

				"write() failed and returned %d\n", ret);

			return;

		}

	}
@@ -376,8 +376,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) 
			ret = par->fbtftops.write(par, buf, len);

			if (ret < 0)

				dev_err(par->info->device,

					"%s: write failed and returned: %d\n",

					__func__, ret);

					"write failed and returned: %d\n",

					ret);

		}

		/* right half of display */

		if (addr_win.xe >= par->info->var.xres / 2) {
@@ -398,8 +398,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) 
			par->fbtftops.write(par, buf, len);

			if (ret < 0)

				dev_err(par->info->device,

					"%s: write failed and returned: %d\n",

					__func__, ret);

					"write failed and returned: %d\n",

					ret);

		}

	}

	kfree(convert_buf);

drivers/staging/fbtft/fb_pcd8544.c

+2 −1
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) 
	gpio_set_value(par->gpio.dc, 1);

	ret = par->fbtftops.write(par, par->txbuf.buf, 6*84);

	if (ret < 0)

		dev_err(par->info->device, "%s: write failed and returned: %d\n", __func__, ret);

		dev_err(par->info->device, "write failed and returned: %d\n",

			ret);



	return ret;

}

drivers/staging/fbtft/fb_ra8875.c

+4 −4
Original line number Diff line number Diff line
@@ -238,8 +238,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) 
	ret = par->fbtftops.write(par, par->buf, 2);

	if (ret < 0) {

		va_end(args);

		dev_err(par->info->device, "%s: write() failed and returned %dn",

			__func__, ret);

		dev_err(par->info->device, "write() failed and returned %dn",

			ret);

		return;

	}

	len--;
@@ -256,8 +256,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) 
		ret = par->fbtftops.write(par, par->buf, len + 1);

		if (ret < 0) {

			va_end(args);

			dev_err(par->info->device, "%s: write() failed and returned %dn",

				__func__, ret);

			dev_err(par->info->device,

				"write() failed and returned %dn", ret);

			return;

		}

	}

drivers/staging/fbtft/fb_ssd1306.c

+2 −2
Original line number Diff line number Diff line
@@ -193,8 +193,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) 
	ret = par->fbtftops.write(par, par->txbuf.buf,

				par->info->var.xres*par->info->var.yres/8);

	if (ret < 0)

		dev_err(par->info->device,

			"%s: write failed and returned: %d\n", __func__, ret);

		dev_err(par->info->device, "write failed and returned: %d\n",

			ret);



	return ret;

}

drivers/staging/fbtft/fb_ssd1331.c

+4 −2
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) 
	ret = par->fbtftops.write(par, par->buf, sizeof(u8));

	if (ret < 0) {

		va_end(args);

		dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret);

		dev_err(par->info->device,

			"write() failed and returned %d\n", ret);

		return;

	}

	len--;
@@ -95,7 +96,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) 
		ret = par->fbtftops.write(par, par->buf, len * (sizeof(u8)));

		if (ret < 0) {

			va_end(args);

			dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret);

			dev_err(par->info->device,

				"write() failed and returned %d\n", ret);

			return;

		}

	}