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

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
...@@ -198,8 +198,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) ...@@ -198,8 +198,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
if (*buf > 1) { if (*buf > 1) {
va_end(args); va_end(args);
dev_err(par->info->device, "%s: Incorrect chip sellect request (%d)\n", dev_err(par->info->device,
__func__, *buf); "Incorrect chip sellect request (%d)\n", *buf);
return; return;
} }
...@@ -224,8 +224,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) ...@@ -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))); ret = par->fbtftops.write(par, par->buf, len * (sizeof(u8)));
if (ret < 0) { if (ret < 0) {
va_end(args); va_end(args);
dev_err(par->info->device, "%s: write() failed and returned %d\n", dev_err(par->info->device,
__func__, ret); "write() failed and returned %d\n", ret);
return; return;
} }
} }
...@@ -376,8 +376,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) ...@@ -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); ret = par->fbtftops.write(par, buf, len);
if (ret < 0) if (ret < 0)
dev_err(par->info->device, dev_err(par->info->device,
"%s: write failed and returned: %d\n", "write failed and returned: %d\n",
__func__, ret); ret);
} }
/* right half of display */ /* right half of display */
if (addr_win.xe >= par->info->var.xres / 2) { 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) ...@@ -398,8 +398,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
par->fbtftops.write(par, buf, len); par->fbtftops.write(par, buf, len);
if (ret < 0) if (ret < 0)
dev_err(par->info->device, dev_err(par->info->device,
"%s: write failed and returned: %d\n", "write failed and returned: %d\n",
__func__, ret); ret);
} }
} }
kfree(convert_buf); kfree(convert_buf);
......
...@@ -130,7 +130,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) ...@@ -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); gpio_set_value(par->gpio.dc, 1);
ret = par->fbtftops.write(par, par->txbuf.buf, 6*84); ret = par->fbtftops.write(par, par->txbuf.buf, 6*84);
if (ret < 0) 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; return ret;
} }
......
...@@ -238,8 +238,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) ...@@ -238,8 +238,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
ret = par->fbtftops.write(par, par->buf, 2); ret = par->fbtftops.write(par, par->buf, 2);
if (ret < 0) { if (ret < 0) {
va_end(args); va_end(args);
dev_err(par->info->device, "%s: write() failed and returned %dn", dev_err(par->info->device, "write() failed and returned %dn",
__func__, ret); ret);
return; return;
} }
len--; len--;
...@@ -256,8 +256,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int 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); ret = par->fbtftops.write(par, par->buf, len + 1);
if (ret < 0) { if (ret < 0) {
va_end(args); va_end(args);
dev_err(par->info->device, "%s: write() failed and returned %dn", dev_err(par->info->device,
__func__, ret); "write() failed and returned %dn", ret);
return; return;
} }
} }
......
...@@ -193,8 +193,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) ...@@ -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, ret = par->fbtftops.write(par, par->txbuf.buf,
par->info->var.xres*par->info->var.yres/8); par->info->var.xres*par->info->var.yres/8);
if (ret < 0) if (ret < 0)
dev_err(par->info->device, dev_err(par->info->device, "write failed and returned: %d\n",
"%s: write failed and returned: %d\n", __func__, ret); ret);
return ret; return ret;
} }
......
...@@ -83,7 +83,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) ...@@ -83,7 +83,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
ret = par->fbtftops.write(par, par->buf, sizeof(u8)); ret = par->fbtftops.write(par, par->buf, sizeof(u8));
if (ret < 0) { if (ret < 0) {
va_end(args); 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; return;
} }
len--; len--;
...@@ -95,7 +96,8 @@ static void write_reg8_bus8(struct fbtft_par *par, int 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))); ret = par->fbtftops.write(par, par->buf, len * (sizeof(u8)));
if (ret < 0) { if (ret < 0) {
va_end(args); 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; return;
} }
} }
......
...@@ -127,7 +127,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) ...@@ -127,7 +127,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
ret = par->fbtftops.write(par, par->txbuf.buf, WIDTH); ret = par->fbtftops.write(par, par->txbuf.buf, WIDTH);
if (ret < 0) { if (ret < 0) {
dev_err(par->info->device, dev_err(par->info->device,
"%s: write failed and returned: %d\n", __func__, ret); "write failed and returned: %d\n", ret);
break; break;
} }
} }
......
...@@ -183,7 +183,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) ...@@ -183,7 +183,8 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
} }
if (ret < 0) 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; return ret;
} }
......
...@@ -65,7 +65,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...) ...@@ -65,7 +65,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
ret = par->fbtftops.write(par, par->buf, len); ret = par->fbtftops.write(par, par->buf, len);
if (ret < 0) { if (ret < 0) {
dev_err(par->info->device, dev_err(par->info->device,
"%s: write() failed and returned %d\n", __func__, ret); "write() failed and returned %d\n", ret);
return; return;
} }
} }
......
...@@ -111,7 +111,7 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...) ...@@ -111,7 +111,7 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...)
ret = par->fbtftops.write(par, par->buf, (len + pad) * sizeof(u16)); ret = par->fbtftops.write(par, par->buf, (len + pad) * sizeof(u16));
if (ret < 0) { if (ret < 0) {
dev_err(par->info->device, dev_err(par->info->device,
"%s: write() failed and returned %d\n", __func__, ret); "write() failed and returned %d\n", ret);
return; return;
} }
} }
......
...@@ -703,9 +703,8 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display, ...@@ -703,9 +703,8 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
/* sanity check */ /* sanity check */
if (display->gamma_num * display->gamma_len > FBTFT_GAMMA_MAX_VALUES_TOTAL) { if (display->gamma_num * display->gamma_len > FBTFT_GAMMA_MAX_VALUES_TOTAL) {
dev_err(dev, dev_err(dev, "FBTFT_GAMMA_MAX_VALUES_TOTAL=%d is exceeded\n",
"%s: FBTFT_GAMMA_MAX_VALUES_TOTAL=%d is exceeded\n", FBTFT_GAMMA_MAX_VALUES_TOTAL);
__func__, FBTFT_GAMMA_MAX_VALUES_TOTAL);
return NULL; return NULL;
} }
......
...@@ -59,8 +59,7 @@ int fbtft_write_spi_emulate_9(struct fbtft_par *par, void *buf, size_t len) ...@@ -59,8 +59,7 @@ int fbtft_write_spi_emulate_9(struct fbtft_par *par, void *buf, size_t len)
} }
if ((len % 8) != 0) { if ((len % 8) != 0) {
dev_err(par->info->device, dev_err(par->info->device,
"%s: error: len=%zu must be divisible by 8\n", "error: len=%zu must be divisible by 8\n", len);
__func__, len);
return -EINVAL; return -EINVAL;
} }
...@@ -106,8 +105,8 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len) ...@@ -106,8 +105,8 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len)
if (par->startbyte) { if (par->startbyte) {
if (len > 32) { if (len > 32) {
dev_err(par->info->device, dev_err(par->info->device,
"%s: len=%zu can't be larger than 32 when using 'startbyte'\n", "len=%zu can't be larger than 32 when using 'startbyte'\n",
__func__, len); len);
return -EINVAL; return -EINVAL;
} }
txbuf[0] = par->startbyte | 0x3; txbuf[0] = par->startbyte | 0x3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment