Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Haneen Mohammed and committed by
Greg Kroah-Hartman
aed1c72e 14f63eee

+30 -28
+8 -8
drivers/staging/fbtft/fb_agm1264k-fl.c
··· 198 198 199 199 if (*buf > 1) { 200 200 va_end(args); 201 - dev_err(par->info->device, "%s: Incorrect chip sellect request (%d)\n", 202 - __func__, *buf); 201 + dev_err(par->info->device, 202 + "Incorrect chip sellect request (%d)\n", *buf); 203 203 return; 204 204 } 205 205 ··· 224 224 ret = par->fbtftops.write(par, par->buf, len * (sizeof(u8))); 225 225 if (ret < 0) { 226 226 va_end(args); 227 - dev_err(par->info->device, "%s: write() failed and returned %d\n", 228 - __func__, ret); 227 + dev_err(par->info->device, 228 + "write() failed and returned %d\n", ret); 229 229 return; 230 230 } 231 231 } ··· 376 376 ret = par->fbtftops.write(par, buf, len); 377 377 if (ret < 0) 378 378 dev_err(par->info->device, 379 - "%s: write failed and returned: %d\n", 380 - __func__, ret); 379 + "write failed and returned: %d\n", 380 + ret); 381 381 } 382 382 /* right half of display */ 383 383 if (addr_win.xe >= par->info->var.xres / 2) { ··· 398 398 par->fbtftops.write(par, buf, len); 399 399 if (ret < 0) 400 400 dev_err(par->info->device, 401 - "%s: write failed and returned: %d\n", 402 - __func__, ret); 401 + "write failed and returned: %d\n", 402 + ret); 403 403 } 404 404 } 405 405 kfree(convert_buf);
+2 -1
drivers/staging/fbtft/fb_pcd8544.c
··· 130 130 gpio_set_value(par->gpio.dc, 1); 131 131 ret = par->fbtftops.write(par, par->txbuf.buf, 6*84); 132 132 if (ret < 0) 133 - dev_err(par->info->device, "%s: write failed and returned: %d\n", __func__, ret); 133 + dev_err(par->info->device, "write failed and returned: %d\n", 134 + ret); 134 135 135 136 return ret; 136 137 }
+4 -4
drivers/staging/fbtft/fb_ra8875.c
··· 238 238 ret = par->fbtftops.write(par, par->buf, 2); 239 239 if (ret < 0) { 240 240 va_end(args); 241 - dev_err(par->info->device, "%s: write() failed and returned %dn", 242 - __func__, ret); 241 + dev_err(par->info->device, "write() failed and returned %dn", 242 + ret); 243 243 return; 244 244 } 245 245 len--; ··· 256 256 ret = par->fbtftops.write(par, par->buf, len + 1); 257 257 if (ret < 0) { 258 258 va_end(args); 259 - dev_err(par->info->device, "%s: write() failed and returned %dn", 260 - __func__, ret); 259 + dev_err(par->info->device, 260 + "write() failed and returned %dn", ret); 261 261 return; 262 262 } 263 263 }
+2 -2
drivers/staging/fbtft/fb_ssd1306.c
··· 193 193 ret = par->fbtftops.write(par, par->txbuf.buf, 194 194 par->info->var.xres*par->info->var.yres/8); 195 195 if (ret < 0) 196 - dev_err(par->info->device, 197 - "%s: write failed and returned: %d\n", __func__, ret); 196 + dev_err(par->info->device, "write failed and returned: %d\n", 197 + ret); 198 198 199 199 return ret; 200 200 }
+4 -2
drivers/staging/fbtft/fb_ssd1331.c
··· 83 83 ret = par->fbtftops.write(par, par->buf, sizeof(u8)); 84 84 if (ret < 0) { 85 85 va_end(args); 86 - dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret); 86 + dev_err(par->info->device, 87 + "write() failed and returned %d\n", ret); 87 88 return; 88 89 } 89 90 len--; ··· 96 95 ret = par->fbtftops.write(par, par->buf, len * (sizeof(u8))); 97 96 if (ret < 0) { 98 97 va_end(args); 99 - dev_err(par->info->device, "%s: write() failed and returned %d\n", __func__, ret); 98 + dev_err(par->info->device, 99 + "write() failed and returned %d\n", ret); 100 100 return; 101 101 } 102 102 }
+1 -1
drivers/staging/fbtft/fb_tls8204.c
··· 127 127 ret = par->fbtftops.write(par, par->txbuf.buf, WIDTH); 128 128 if (ret < 0) { 129 129 dev_err(par->info->device, 130 - "%s: write failed and returned: %d\n", __func__, ret); 130 + "write failed and returned: %d\n", ret); 131 131 break; 132 132 } 133 133 }
+2 -1
drivers/staging/fbtft/fb_uc1701.c
··· 183 183 } 184 184 185 185 if (ret < 0) 186 - dev_err(par->info->device, "%s: write failed and returned: %d\n", __func__, ret); 186 + dev_err(par->info->device, "write failed and returned: %d\n", 187 + ret); 187 188 188 189 return ret; 189 190 }
+1 -1
drivers/staging/fbtft/fb_watterott.c
··· 65 65 ret = par->fbtftops.write(par, par->buf, len); 66 66 if (ret < 0) { 67 67 dev_err(par->info->device, 68 - "%s: write() failed and returned %d\n", __func__, ret); 68 + "write() failed and returned %d\n", ret); 69 69 return; 70 70 } 71 71 }
+1 -1
drivers/staging/fbtft/fbtft-bus.c
··· 111 111 ret = par->fbtftops.write(par, par->buf, (len + pad) * sizeof(u16)); 112 112 if (ret < 0) { 113 113 dev_err(par->info->device, 114 - "%s: write() failed and returned %d\n", __func__, ret); 114 + "write() failed and returned %d\n", ret); 115 115 return; 116 116 } 117 117 }
+2 -3
drivers/staging/fbtft/fbtft-core.c
··· 703 703 704 704 /* sanity check */ 705 705 if (display->gamma_num * display->gamma_len > FBTFT_GAMMA_MAX_VALUES_TOTAL) { 706 - dev_err(dev, 707 - "%s: FBTFT_GAMMA_MAX_VALUES_TOTAL=%d is exceeded\n", 708 - __func__, FBTFT_GAMMA_MAX_VALUES_TOTAL); 706 + dev_err(dev, "FBTFT_GAMMA_MAX_VALUES_TOTAL=%d is exceeded\n", 707 + FBTFT_GAMMA_MAX_VALUES_TOTAL); 709 708 return NULL; 710 709 } 711 710
+3 -4
drivers/staging/fbtft/fbtft-io.c
··· 59 59 } 60 60 if ((len % 8) != 0) { 61 61 dev_err(par->info->device, 62 - "%s: error: len=%zu must be divisible by 8\n", 63 - __func__, len); 62 + "error: len=%zu must be divisible by 8\n", len); 64 63 return -EINVAL; 65 64 } 66 65 ··· 105 106 if (par->startbyte) { 106 107 if (len > 32) { 107 108 dev_err(par->info->device, 108 - "%s: len=%zu can't be larger than 32 when using 'startbyte'\n", 109 - __func__, len); 109 + "len=%zu can't be larger than 32 when using 'startbyte'\n", 110 + len); 110 111 return -EINVAL; 111 112 } 112 113 txbuf[0] = par->startbyte | 0x3;