* [PATCH 0/7] Staging: clean de_err() loging
@ 2015-03-05 19:29 Haneen Mohammed
2015-03-05 19:31 ` [PATCH 1/7] Staging: media: Clean dev_err() logging Haneen Mohammed
` (15 more replies)
0 siblings, 16 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 19:29 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
This patchset 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;
expression msg;
@@
dev_err(E, msg, __func__);
@script:python b@git rebae -i
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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Haneen Mohammed (7):
Staging: media: Clean dev_err() logging
Staging: fbtft: Clean dev_err() logging
Staging: iio: Clean dev_err() logging
Staging: octeon-usb: Clean dev_err() logging
Staging: slicoss: Clean dev_err() logging
Staging: gdm72xx: Clean dev_err() logging
Staging: ste_rmi4: Clean dev_err() logging
drivers/staging/fbtft/fb_ra8875.c | 3 +--
drivers/staging/fbtft/fb_ssd1351.c | 3 +--
drivers/staging/fbtft/fb_watterott.c | 3 +--
drivers/staging/fbtft/fbtft-bus.c | 4 +--
drivers/staging/fbtft/fbtft-core.c | 14 ++++------
drivers/staging/fbtft/fbtft-io.c | 11 +++-----
drivers/staging/gdm72xx/gdm_usb.c | 4 +--
drivers/staging/iio/light/tsl2x7x_core.c | 38 +++++++++------------------
drivers/staging/media/lirc/lirc_imon.c | 32 +++++++++-------------
drivers/staging/media/lirc/lirc_sasem.c | 25 +++++++-----------
drivers/staging/media/lirc/lirc_zilog.c | 3 +--
drivers/staging/octeon-usb/octeon-hcd.c | 2 +-
drivers/staging/slicoss/slicoss.c | 14 +++++-----
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 37 +++++++++-----------------
14 files changed, 71 insertions(+), 122 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/7] Staging: media: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
@ 2015-03-05 19:31 ` Haneen Mohammed
2015-03-05 19:35 ` [PATCH 2/7] Staging: fbtft: " Haneen Mohammed
` (14 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 19:31 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@script:python b@git rebae -i
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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/media/lirc/lirc_imon.c | 32 ++++++++++++--------------------
drivers/staging/media/lirc/lirc_sasem.c | 25 +++++++++----------------
drivers/staging/media/lirc/lirc_zilog.c | 3 +--
3 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c
index 9ce7d99..d490607 100644
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -251,12 +251,10 @@ static int display_open(struct inode *inode, struct file *file)
mutex_lock(&context->ctx_lock);
if (!context->display) {
- dev_err(&interface->dev,
- "%s: display not supported by device\n", __func__);
+ dev_err(&interface->dev, "display not supported by device\n");
retval = -ENODEV;
} else if (context->display_isopen) {
- dev_err(&interface->dev,
- "%s: display port is already open\n", __func__);
+ dev_err(&interface->dev, "display port is already open\n");
retval = -EBUSY;
} else {
context->display_isopen = 1;
@@ -291,11 +289,10 @@ static int display_close(struct inode *inode, struct file *file)
if (!context->display) {
dev_err(&context->usbdev->dev,
- "%s: display not supported by device\n", __func__);
+ "display not supported by device\n");
retval = -ENODEV;
} else if (!context->display_isopen) {
- dev_err(&context->usbdev->dev,
- "%s: display is not open\n", __func__);
+ dev_err(&context->usbdev->dev, "display is not open\n");
retval = -EIO;
} else {
context->display_isopen = 0;
@@ -352,8 +349,7 @@ static int send_packet(struct imon_context *context)
retval = wait_for_completion_interruptible(
&context->tx.finished);
if (retval)
- dev_err(&context->usbdev->dev,
- "%s: task interrupted\n", __func__);
+ dev_err(&context->usbdev->dev, "task interrupted\n");
mutex_lock(&context->ctx_lock);
retval = context->tx.status;
@@ -398,15 +394,13 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,
mutex_lock(&context->ctx_lock);
if (!context->dev_present) {
- dev_err(&context->usbdev->dev,
- "%s: no iMON device present\n", __func__);
+ dev_err(&context->usbdev->dev, "no iMON device present\n");
retval = -ENODEV;
goto exit;
}
if (n_bytes <= 0 || n_bytes > IMON_DATA_BUF_SZ - 3) {
- dev_err(&context->usbdev->dev,
- "%s: invalid payload size\n", __func__);
+ dev_err(&context->usbdev->dev, "invalid payload size\n");
retval = -EINVAL;
goto exit;
}
@@ -775,8 +769,7 @@ static int imon_probe(struct usb_interface *interface,
/* Input endpoint is mandatory */
if (!ir_ep_found) {
- dev_err(dev, "%s: no valid input (IR) endpoint found.\n",
- __func__);
+ dev_err(dev, "no valid input (IR) endpoint found.\n");
retval = -ENODEV;
alloc_status = 2;
goto alloc_status_switch;
@@ -802,20 +795,19 @@ static int imon_probe(struct usb_interface *interface,
goto alloc_status_switch;
}
if (lirc_buffer_init(rbuf, BUF_CHUNK_SIZE, BUF_SIZE)) {
- dev_err(dev, "%s: lirc_buffer_init failed\n", __func__);
+ dev_err(dev, "lirc_buffer_init failed\n");
alloc_status = 4;
goto alloc_status_switch;
}
rx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!rx_urb) {
- dev_err(dev, "%s: usb_alloc_urb failed for IR urb\n", __func__);
+ dev_err(dev, "usb_alloc_urb failed for IR urb\n");
alloc_status = 5;
goto alloc_status_switch;
}
tx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!tx_urb) {
- dev_err(dev, "%s: usb_alloc_urb failed for display urb\n",
- __func__);
+ dev_err(dev, "usb_alloc_urb failed for display urb\n");
alloc_status = 6;
goto alloc_status_switch;
}
@@ -842,7 +834,7 @@ static int imon_probe(struct usb_interface *interface,
lirc_minor = lirc_register_driver(driver);
if (lirc_minor < 0) {
- dev_err(dev, "%s: lirc_register_driver failed\n", __func__);
+ dev_err(dev, "lirc_register_driver failed\n");
alloc_status = 7;
goto unlock;
} else
diff --git a/drivers/staging/media/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c
index 4a26820..b7261b3 100644
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -224,8 +224,7 @@ static int vfd_open(struct inode *inode, struct file *file)
mutex_lock(&context->ctx_lock);
if (context->vfd_isopen) {
- dev_err(&interface->dev,
- "%s: VFD port is already open", __func__);
+ dev_err(&interface->dev, "VFD port is already open");
retval = -EBUSY;
} else {
context->vfd_isopen = 1;
@@ -292,7 +291,7 @@ static int vfd_close(struct inode *inode, struct file *file)
mutex_lock(&context->ctx_lock);
if (!context->vfd_isopen) {
- dev_err(&context->dev->dev, "%s: VFD is not open\n", __func__);
+ dev_err(&context->dev->dev, "VFD is not open\n");
retval = -EIO;
} else {
context->vfd_isopen = 0;
@@ -383,8 +382,7 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,
}
if (n_bytes <= 0 || n_bytes > SASEM_DATA_BUF_SZ) {
- dev_err(&context->dev->dev, "%s: invalid payload size\n",
- __func__);
+ dev_err(&context->dev->dev, "invalid payload size\n");
retval = -EINVAL;
goto exit;
}
@@ -493,8 +491,7 @@ static int ir_open(void *data)
mutex_lock(&context->ctx_lock);
if (context->ir_isopen) {
- dev_err(&context->dev->dev, "%s: IR port is already open\n",
- __func__);
+ dev_err(&context->dev->dev, "IR port is already open\n");
retval = -EBUSY;
goto exit;
}
@@ -734,7 +731,7 @@ static int sasem_probe(struct usb_interface *interface,
/* Input endpoint is mandatory */
if (!ir_ep_found) {
dev_err(&interface->dev,
- "%s: no valid input (IR) endpoint found.\n", __func__);
+ "no valid input (IR) endpoint found.\n");
retval = -ENODEV;
goto exit;
}
@@ -764,15 +761,13 @@ static int sasem_probe(struct usb_interface *interface,
goto alloc_status_switch;
}
if (lirc_buffer_init(rbuf, BUF_CHUNK_SIZE, BUF_SIZE)) {
- dev_err(&interface->dev,
- "%s: lirc_buffer_init failed\n", __func__);
+ dev_err(&interface->dev, "lirc_buffer_init failed\n");
alloc_status = 4;
goto alloc_status_switch;
}
rx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!rx_urb) {
- dev_err(&interface->dev,
- "%s: usb_alloc_urb failed for IR urb\n", __func__);
+ dev_err(&interface->dev, "usb_alloc_urb failed for IR urb\n");
alloc_status = 5;
goto alloc_status_switch;
}
@@ -780,8 +775,7 @@ static int sasem_probe(struct usb_interface *interface,
tx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!tx_urb) {
dev_err(&interface->dev,
- "%s: usb_alloc_urb failed for VFD urb",
- __func__);
+ "usb_alloc_urb failed for VFD urb");
alloc_status = 6;
goto alloc_status_switch;
}
@@ -805,8 +799,7 @@ static int sasem_probe(struct usb_interface *interface,
lirc_minor = lirc_register_driver(driver);
if (lirc_minor < 0) {
- dev_err(&interface->dev,
- "%s: lirc_register_driver failed\n", __func__);
+ dev_err(&interface->dev, "lirc_register_driver failed\n");
alloc_status = 7;
retval = lirc_minor;
goto unlock;
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index e16627c..abcc9e4 100644
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -1590,8 +1590,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
if (IS_ERR(rx->task)) {
ret = PTR_ERR(rx->task);
dev_err(tx->ir->l.dev,
- "%s: could not start IR Rx polling thread\n",
- __func__);
+ "could not start IR Rx polling thread\n");
/* Failed kthread, so put back the ir ref */
put_ir_device(ir, true);
/* Failure exit, so put back rx ref from i2c_client */
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 2/7] Staging: fbtft: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
2015-03-05 19:31 ` [PATCH 1/7] Staging: media: Clean dev_err() logging Haneen Mohammed
@ 2015-03-05 19:35 ` Haneen Mohammed
2015-03-05 19:37 ` [PATCH 3/7] Staging: iio: " Haneen Mohammed
` (13 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 19:35 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@script:python b@git rebae -i
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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/fbtft/fb_ra8875.c | 3 +--
drivers/staging/fbtft/fb_ssd1351.c | 3 +--
drivers/staging/fbtft/fb_watterott.c | 3 +--
drivers/staging/fbtft/fbtft-bus.c | 4 ++--
drivers/staging/fbtft/fbtft-core.c | 14 +++++---------
drivers/staging/fbtft/fbtft-io.c | 11 ++++-------
6 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/fbtft/fb_ra8875.c b/drivers/staging/fbtft/fb_ra8875.c
index 8df9737..a186458 100644
--- a/drivers/staging/fbtft/fb_ra8875.c
+++ b/drivers/staging/fbtft/fb_ra8875.c
@@ -52,8 +52,7 @@ static int write_spi(struct fbtft_par *par, void *buf, size_t len)
"%s(len=%d): ", __func__, len);
if (!par->spi) {
- dev_err(par->info->device,
- "%s: par->spi is unexpectedly NULL\n", __func__);
+ dev_err(par->info->device, "par->spi is unexpectedly NULL\n");
return -1;
}
diff --git a/drivers/staging/fbtft/fb_ssd1351.c b/drivers/staging/fbtft/fb_ssd1351.c
index b59120c..b925dd5 100644
--- a/drivers/staging/fbtft/fb_ssd1351.c
+++ b/drivers/staging/fbtft/fb_ssd1351.c
@@ -220,8 +220,7 @@ static void register_onboard_backlight(struct fbtft_par *par)
GFP_KERNEL);
if (!bl_ops) {
dev_err(par->info->device,
- "%s: could not allocate memory for backlight operations.\n",
- __func__);
+ "could not allocate memory for backlight operations.\n");
return;
}
diff --git a/drivers/staging/fbtft/fb_watterott.c b/drivers/staging/fbtft/fb_watterott.c
index 975b579..5e6595f 100644
--- a/drivers/staging/fbtft/fb_watterott.c
+++ b/drivers/staging/fbtft/fb_watterott.c
@@ -269,8 +269,7 @@ static void register_chip_backlight(struct fbtft_par *par)
GFP_KERNEL);
if (!bl_ops) {
dev_err(par->info->device,
- "%s: could not allocate memory for backlight operations.\n",
- __func__);
+ "could not allocate memory for backlight operations.\n");
return;
}
diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/staging/fbtft/fbtft-bus.c
index b3cddb0..4b9a481 100644
--- a/drivers/staging/fbtft/fbtft-bus.c
+++ b/drivers/staging/fbtft/fbtft-bus.c
@@ -196,7 +196,7 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len)
__func__, offset, len);
if (!par->txbuf.buf) {
- dev_err(par->info->device, "%s: txbuf.buf is NULL\n", __func__);
+ dev_err(par->info->device, "txbuf.buf is NULL\n");
return -1;
}
@@ -232,7 +232,7 @@ EXPORT_SYMBOL(fbtft_write_vmem16_bus9);
int fbtft_write_vmem8_bus8(struct fbtft_par *par, size_t offset, size_t len)
{
- dev_err(par->info->device, "%s: function not implemented\n", __func__);
+ dev_err(par->info->device, "function not implemented\n");
return -1;
}
EXPORT_SYMBOL(fbtft_write_vmem8_bus8);
diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
index e8d8d07..f0164218 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -304,8 +304,7 @@ void fbtft_register_backlight(struct fbtft_par *par)
GFP_KERNEL);
if (!bl_ops) {
dev_err(par->info->device,
- "%s: could not allocate memeory for backlight operations.\n",
- __func__);
+ "could not allocate memeory for backlight operations.\n");
return;
}
@@ -414,8 +413,7 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned start_line,
ret = par->fbtftops.write_vmem(par, offset, len);
if (ret < 0)
dev_err(par->info->device,
- "%s: write_vmem failed to update display buffer\n",
- __func__);
+ "write_vmem failed to update display buffer\n");
if (unlikely(timeit)) {
getnstimeofday(&ts_end);
@@ -1091,8 +1089,7 @@ static int fbtft_init_display_dt(struct fbtft_par *par)
while (p && !(val & 0xFFFF0000)) {
if (i > 63) {
dev_err(par->info->device,
- "%s: Maximum register values exceeded\n",
- __func__);
+ "Maximum register values exceeded\n");
return -EINVAL;
}
buf[i++] = val;
@@ -1216,8 +1213,7 @@ int fbtft_init_display(struct fbtft_par *par)
while (par->init_sequence[i] >= 0) {
if (j > 63) {
dev_err(par->info->device,
- "%s: Maximum register values exceeded\n",
- __func__);
+ "Maximum register values exceeded\n");
return -EINVAL;
}
buf[j++] = par->init_sequence[i++];
@@ -1255,7 +1251,7 @@ int fbtft_init_display(struct fbtft_par *par)
}
dev_err(par->info->device,
- "%s: something is wrong. Shouldn't get here.\n", __func__);
+ "something is wrong. Shouldn't get here.\n");
return -EINVAL;
}
EXPORT_SYMBOL(fbtft_init_display);
diff --git a/drivers/staging/fbtft/fbtft-io.c b/drivers/staging/fbtft/fbtft-io.c
index 9b2f8cf..17ab078 100644
--- a/drivers/staging/fbtft/fbtft-io.c
+++ b/drivers/staging/fbtft/fbtft-io.c
@@ -16,8 +16,7 @@ int fbtft_write_spi(struct fbtft_par *par, void *buf, size_t len)
"%s(len=%d): ", __func__, len);
if (!par->spi) {
- dev_err(par->info->device,
- "%s: par->spi is unexpectedly NULL\n", __func__);
+ dev_err(par->info->device, "par->spi is unexpectedly NULL\n");
return -1;
}
@@ -53,8 +52,7 @@ int fbtft_write_spi_emulate_9(struct fbtft_par *par, void *buf, size_t len)
"%s(len=%d): ", __func__, len);
if (!par->extra) {
- dev_err(par->info->device, "%s: error: par->extra is NULL\n",
- __func__);
+ dev_err(par->info->device, "error: par->extra is NULL\n");
return -EINVAL;
}
if ((len % 8) != 0) {
@@ -98,8 +96,7 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len)
struct spi_message m;
if (!par->spi) {
- dev_err(par->info->device,
- "%s: par->spi is unexpectedly NULL\n", __func__);
+ dev_err(par->info->device, "par->spi is unexpectedly NULL\n");
return -ENODEV;
}
@@ -233,7 +230,7 @@ EXPORT_SYMBOL(fbtft_write_gpio16_wr);
int fbtft_write_gpio16_wr_latched(struct fbtft_par *par, void *buf, size_t len)
{
- dev_err(par->info->device, "%s: function not implemented\n", __func__);
+ dev_err(par->info->device, "function not implemented\n");
return -1;
}
EXPORT_SYMBOL(fbtft_write_gpio16_wr_latched);
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 3/7] Staging: iio: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
2015-03-05 19:31 ` [PATCH 1/7] Staging: media: Clean dev_err() logging Haneen Mohammed
2015-03-05 19:35 ` [PATCH 2/7] Staging: fbtft: " Haneen Mohammed
@ 2015-03-05 19:37 ` Haneen Mohammed
2015-03-05 19:38 ` [PATCH 4/7] Staging: octeon-usb: " Haneen Mohammed
` (12 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 19:37 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@script:python b@git rebae -i
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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/iio/light/tsl2x7x_core.c | 38 +++++++++++---------------------
1 file changed, 13 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c
index 4a5dc26..1222a57 100644
--- a/drivers/staging/iio/light/tsl2x7x_core.c
+++ b/drivers/staging/iio/light/tsl2x7x_core.c
@@ -350,8 +350,7 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
if (chip->tsl2x7x_chip_status != TSL2X7X_CHIP_WORKING) {
/* device is not enabled */
- dev_err(&chip->client->dev, "%s: device is not enabled\n",
- __func__);
+ dev_err(&chip->client->dev, "device is not enabled\n");
ret = -EBUSY;
goto out_unlock;
}
@@ -359,14 +358,12 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
ret = tsl2x7x_i2c_read(chip->client,
(TSL2X7X_CMD_REG | TSL2X7X_STATUS), &buf[0]);
if (ret < 0) {
- dev_err(&chip->client->dev,
- "%s: Failed to read STATUS Reg\n", __func__);
+ dev_err(&chip->client->dev, "Failed to read STATUS Reg\n");
goto out_unlock;
}
/* is data new & valid */
if (!(buf[0] & TSL2X7X_STA_ADC_VALID)) {
- dev_err(&chip->client->dev,
- "%s: data not valid yet\n", __func__);
+ dev_err(&chip->client->dev, "data not valid yet\n");
ret = chip->als_cur_info.lux; /* return LAST VALUE */
goto out_unlock;
}
@@ -485,8 +482,7 @@ static int tsl2x7x_get_prox(struct iio_dev *indio_dev)
struct tsl2X7X_chip *chip = iio_priv(indio_dev);
if (mutex_trylock(&chip->prox_mutex) == 0) {
- dev_err(&chip->client->dev,
- "%s: Can't get prox mutex\n", __func__);
+ dev_err(&chip->client->dev, "Can't get prox mutex\n");
return -EBUSY;
}
@@ -591,8 +587,7 @@ static int tsl2x7x_als_calibrate(struct iio_dev *indio_dev)
reg_val = i2c_smbus_read_byte(chip->client);
if ((reg_val & (TSL2X7X_CNTL_ADC_ENBL | TSL2X7X_CNTL_PWR_ON))
!= (TSL2X7X_CNTL_ADC_ENBL | TSL2X7X_CNTL_PWR_ON)) {
- dev_err(&chip->client->dev,
- "%s: failed: ADC not enabled\n", __func__);
+ dev_err(&chip->client->dev, "failed: ADC not enabled\n");
return -1;
}
@@ -608,14 +603,13 @@ static int tsl2x7x_als_calibrate(struct iio_dev *indio_dev)
reg_val = i2c_smbus_read_byte(chip->client);
if ((reg_val & TSL2X7X_STA_ADC_VALID) != TSL2X7X_STA_ADC_VALID) {
dev_err(&chip->client->dev,
- "%s: failed: STATUS - ADC not valid.\n", __func__);
+ "failed: STATUS - ADC not valid.\n");
return -ENODATA;
}
lux_val = tsl2x7x_get_lux(indio_dev);
if (lux_val < 0) {
- dev_err(&chip->client->dev,
- "%s: failed to get lux\n", __func__);
+ dev_err(&chip->client->dev, "failed to get lux\n");
return lux_val;
}
@@ -707,8 +701,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
ret = i2c_smbus_write_byte_data(chip->client,
TSL2X7X_CMD_REG | TSL2X7X_CNTRL, utmp);
if (ret < 0) {
- dev_err(&chip->client->dev,
- "%s: failed on CNTRL reg.\n", __func__);
+ dev_err(&chip->client->dev, "failed on CNTRL reg.\n");
return ret;
}
@@ -735,8 +728,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
ret = i2c_smbus_write_byte_data(chip->client,
TSL2X7X_CMD_REG | TSL2X7X_CNTRL, utmp);
if (ret < 0) {
- dev_err(&chip->client->dev,
- "%s: failed on 2nd CTRL reg.\n", __func__);
+ dev_err(&chip->client->dev, "failed on 2nd CTRL reg.\n");
return ret;
}
@@ -755,8 +747,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
(TSL2X7X_CMD_REG | TSL2X7X_CNTRL), reg_val);
if (ret < 0)
dev_err(&chip->client->dev,
- "%s: failed in tsl2x7x_IOCTL_INT_SET.\n",
- __func__);
+ "failed in tsl2x7x_IOCTL_INT_SET.\n");
/* Clear out any initial interrupts */
ret = i2c_smbus_write_byte(chip->client,
@@ -764,8 +755,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
TSL2X7X_CMD_PROXALS_INT_CLR);
if (ret < 0) {
dev_err(&chip->client->dev,
- "%s: Failed to clear Int status\n",
- __func__);
+ "Failed to clear Int status\n");
return ret;
}
}
@@ -1925,8 +1915,7 @@ static int tsl2x7x_probe(struct i2c_client *clientp,
"TSL2X7X_event",
indio_dev);
if (ret) {
- dev_err(&clientp->dev,
- "%s: irq request failed", __func__);
+ dev_err(&clientp->dev, "irq request failed");
return ret;
}
}
@@ -1938,8 +1927,7 @@ static int tsl2x7x_probe(struct i2c_client *clientp,
ret = iio_device_register(indio_dev);
if (ret) {
- dev_err(&clientp->dev,
- "%s: iio registration failed\n", __func__);
+ dev_err(&clientp->dev, "iio registration failed\n");
return ret;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 4/7] Staging: octeon-usb: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (2 preceding siblings ...)
2015-03-05 19:37 ` [PATCH 3/7] Staging: iio: " Haneen Mohammed
@ 2015-03-05 19:38 ` Haneen Mohammed
2015-03-05 19:38 ` [PATCH 5/7] Staging: slicoss: " Haneen Mohammed
` (11 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 19:38 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@script:python b@git rebae -i
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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/octeon-usb/octeon-hcd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c
index 1daeb31..e892de2 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -1531,7 +1531,7 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb,
switch (transaction->stage) {
case CVMX_USB_STAGE_NON_CONTROL:
case CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE:
- dev_err(dev, "%s: ERROR - Non control stage\n", __func__);
+ dev_err(dev, "ERROR - Non control stage\n");
break;
case CVMX_USB_STAGE_SETUP:
usbc_hctsiz.s.pid = 3; /* Setup */
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 5/7] Staging: slicoss: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (3 preceding siblings ...)
2015-03-05 19:38 ` [PATCH 4/7] Staging: octeon-usb: " Haneen Mohammed
@ 2015-03-05 19:38 ` Haneen Mohammed
2015-03-05 19:42 ` [PATCH 6/7] Staging: gdm72xx: " Haneen Mohammed
` (10 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 19:38 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@script:python b@git rebae -i
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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/slicoss/slicoss.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 45f6a5f..2923b2c 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -1529,8 +1529,8 @@ retry_rcvqfill:
skb->next = NULL;
#ifdef KLUDGE_FOR_4GB_BOUNDARY
if (paddrl == 0) {
- dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
- __func__);
+ dev_err(dev,
+ "LOW 32bits PHYSICAL ADDRESS == 0\n");
dev_err(dev, "skb[%p] PROBLEM\n", skb);
dev_err(dev, " skbdata[%p]\n",
skb->data);
@@ -1549,8 +1549,8 @@ retry_rcvqfill:
}
#else
if (paddrl == 0) {
- dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
- __func__);
+ dev_err(dev,
+ "LOW 32bits PHYSICAL ADDRESS == 0\n");
dev_err(dev, "skb[%p] PROBLEM\n", skb);
dev_err(dev, " skbdata[%p]\n",
skb->data);
@@ -1685,8 +1685,7 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
if (paddrl == 0) {
dev = &adapter->netdev->dev;
- dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
- __func__);
+ dev_err(dev, "LOW 32bits PHYSICAL ADDRESS == 0\n");
dev_err(dev, "skb[%p] PROBLEM\n", skb);
dev_err(dev, " skbdata[%p]\n", skb->data);
dev_err(dev, " skblen[%x]\n", skb->len);
@@ -2293,8 +2292,7 @@ static int slic_if_init(struct adapter *adapter)
/* adapter should be down at this point */
if (adapter->state != ADAPT_DOWN) {
- dev_err(&dev->dev, "%s: adapter->state != ADAPT_DOWN\n",
- __func__);
+ dev_err(&dev->dev, "adapter->state != ADAPT_DOWN\n");
rc = -EIO;
goto err;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 6/7] Staging: gdm72xx: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (4 preceding siblings ...)
2015-03-05 19:38 ` [PATCH 5/7] Staging: slicoss: " Haneen Mohammed
@ 2015-03-05 19:42 ` Haneen Mohammed
2015-03-05 19:43 ` [PATCH 7/7] Staging: ste_rmi4: " Haneen Mohammed
` (9 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 19:42 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@script:python b@git rebae -i
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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/gdm72xx/gdm_usb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c
index eac2f34..5ca5f81 100644
--- a/drivers/staging/gdm72xx/gdm_usb.c
+++ b/drivers/staging/gdm72xx/gdm_usb.c
@@ -301,7 +301,7 @@ static int gdm_usb_send(void *priv_dev, void *data, int len,
#endif /* CONFIG_WIMAX_GDM72XX_K_MODE */
if (!udev->usbdev) {
- dev_err(&usbdev->dev, "%s: No such device\n", __func__);
+ dev_err(&usbdev->dev, "No such device\n");
return -ENODEV;
}
@@ -470,7 +470,7 @@ static int gdm_usb_receive(void *priv_dev,
unsigned long flags;
if (!udev->usbdev) {
- dev_err(&usbdev->dev, "%s: No such device\n", __func__);
+ dev_err(&usbdev->dev, "No such device\n");
return -ENODEV;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 7/7] Staging: ste_rmi4: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (5 preceding siblings ...)
2015-03-05 19:42 ` [PATCH 6/7] Staging: gdm72xx: " Haneen Mohammed
@ 2015-03-05 19:43 ` Haneen Mohammed
2015-03-05 20:40 ` [Outreachy kernel] " Julia Lawall
2015-03-05 21:29 ` [PATCH v2 0/7] Staging: clean de_err() loging Haneen Mohammed
` (8 subsequent siblings)
15 siblings, 1 reply; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 19:43 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
This patch removes __func__ from dev_err. dev_err includes information about:
(devcice, driver, specific instance of device, etc) in the log printout, so there is no need for __func__.
This was done using Coccinelle, with the following semantic patch:
@a@
expression E;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 37 ++++++++++-----------------
1 file changed, 13 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index f92ae1d..508f8e1 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -339,8 +339,7 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
retval = synaptics_rmi4_i2c_block_read(pdata, data_base_addr, values,
finger_registers);
if (retval != finger_registers) {
- dev_err(&client->dev, "%s:read status registers failed\n",
- __func__);
+ dev_err(&client->dev, "read status registers failed\n");
return 0;
}
/*
@@ -371,8 +370,7 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
data_offset, data,
data_reg_blk_size);
if (retval != data_reg_blk_size) {
- dev_err(&client->dev, "%s:read data failed\n",
- __func__);
+ dev_err(&client->dev, "read data failed\n");
return 0;
}
x = (data[0] << 4) | (data[2] & MASK_4BIT);
@@ -419,8 +417,7 @@ static int synaptics_rmi4_report_device(struct synaptics_rmi4_data *pdata,
if (rfi->fn_number != SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM) {
num_error_reports++;
if (num_error_reports < MAX_ERROR_REPORT)
- dev_err(&client->dev, "%s:report not supported\n",
- __func__);
+ dev_err(&client->dev, "report not supported\n");
} else
touch = synpatics_rmi4_touchpad_report(pdata, rfi);
return touch;
@@ -545,8 +542,7 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata,
queries,
sizeof(queries));
if (retval != sizeof(queries)) {
- dev_err(&client->dev, "%s:read function query registers\n",
- __func__);
+ dev_err(&client->dev, "read function query registers\n");
return retval;
}
/*
@@ -670,16 +666,14 @@ static int synaptics_rmi4_touchpad_config(struct synaptics_rmi4_data *pdata,
rfi->fn_desc.query_base_addr,
data, QUERY_LEN);
if (retval != QUERY_LEN)
- dev_err(&client->dev, "%s:read query registers failed\n",
- __func__);
+ dev_err(&client->dev, "read query registers failed\n");
else {
retval = synaptics_rmi4_i2c_block_read(pdata,
rfi->fn_desc.ctrl_base_addr,
data, DATA_BUF_LEN);
if (retval != DATA_BUF_LEN) {
dev_err(&client->dev,
- "%s:read control registers failed\n",
- __func__);
+ "read control registers failed\n");
return retval;
}
/* Store these for use later*/
@@ -727,7 +721,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
sizeof(rmi_fd));
if (retval != sizeof(rmi_fd)) {
/* failed to read next PDT entry */
- dev_err(&client->dev, "%s: read error\n", __func__);
+ dev_err(&client->dev, "read error\n");
return -EIO;
}
rfi = NULL;
@@ -799,8 +793,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
std_queries,
sizeof(std_queries));
if (retval != sizeof(std_queries)) {
- dev_err(&client->dev, "%s:Failed reading queries\n",
- __func__);
+ dev_err(&client->dev, "Failed reading queries\n");
return -EIO;
}
@@ -847,8 +840,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
return retval;
} else
dev_err(&client->dev,
- "%s:fn_number not supported\n",
- __func__);
+ "fn_number not supported\n");
/*
* Turn on interrupts for this
* function's data sources.
@@ -919,15 +911,13 @@ static int synaptics_rmi4_probe
rmi4_data->regulator = regulator_get(&client->dev, "vdd");
if (IS_ERR(rmi4_data->regulator)) {
- dev_err(&client->dev, "%s:get regulator failed\n",
- __func__);
+ dev_err(&client->dev, "get regulator failed\n");
retval = PTR_ERR(rmi4_data->regulator);
goto err_get_regulator;
}
retval = regulator_enable(rmi4_data->regulator);
if (retval < 0) {
- dev_err(&client->dev, "%s:regulator enable failed\n",
- __func__);
+ dev_err(&client->dev, "regulator enable failed\n");
goto err_regulator_enable;
}
init_waitqueue_head(&rmi4_data->wait);
@@ -952,8 +942,7 @@ static int synaptics_rmi4_probe
*/
retval = synaptics_rmi4_i2c_query_device(rmi4_data);
if (retval) {
- dev_err(&client->dev, "%s: rmi4 query device failed\n",
- __func__);
+ dev_err(&client->dev, "rmi4 query device failed\n");
goto err_query_dev;
}
@@ -997,7 +986,7 @@ static int synaptics_rmi4_probe
retval = input_register_device(rmi4_data->input_dev);
if (retval) {
- dev_err(&client->dev, "%s:input register failed\n", __func__);
+ dev_err(&client->dev, "input register failed\n");
goto err_free_irq;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [Outreachy kernel] [PATCH 7/7] Staging: ste_rmi4: Clean dev_err() logging
2015-03-05 19:43 ` [PATCH 7/7] Staging: ste_rmi4: " Haneen Mohammed
@ 2015-03-05 20:40 ` Julia Lawall
2015-03-05 21:02 ` Haneen Mohammed
0 siblings, 1 reply; 20+ messages in thread
From: Julia Lawall @ 2015-03-05 20:40 UTC (permalink / raw)
To: Haneen Mohammed; +Cc: outreachy-kernel
On Thu, 5 Mar 2015, Haneen Mohammed wrote:
> This patch removes __func__ from dev_err. dev_err includes information about:
> (devcice, driver, specific instance of device, etc) in the log printout, so there is no need for __func__.
> This was done using Coccinelle, with the following semantic patch:
>
> @a@
> expression E;
> expression msg;
> @@
>
> dev_err(E, msg, __func__);
>
> @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;
Clever! Does it give false positives? Or maybe false negatives (not
finding all cases).
julia
> @c@
> expression a.E, a.msg;
> identifier b.y;
> @@
>
> - dev_err(E, msg, __func__);
> + dev_err(E, y);
>
> Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
> ---
> drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 37 ++++++++++-----------------
> 1 file changed, 13 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> index f92ae1d..508f8e1 100644
> --- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> +++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> @@ -339,8 +339,7 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
> retval = synaptics_rmi4_i2c_block_read(pdata, data_base_addr, values,
> finger_registers);
> if (retval != finger_registers) {
> - dev_err(&client->dev, "%s:read status registers failed\n",
> - __func__);
> + dev_err(&client->dev, "read status registers failed\n");
> return 0;
> }
> /*
> @@ -371,8 +370,7 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
> data_offset, data,
> data_reg_blk_size);
> if (retval != data_reg_blk_size) {
> - dev_err(&client->dev, "%s:read data failed\n",
> - __func__);
> + dev_err(&client->dev, "read data failed\n");
> return 0;
> }
> x = (data[0] << 4) | (data[2] & MASK_4BIT);
> @@ -419,8 +417,7 @@ static int synaptics_rmi4_report_device(struct synaptics_rmi4_data *pdata,
> if (rfi->fn_number != SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM) {
> num_error_reports++;
> if (num_error_reports < MAX_ERROR_REPORT)
> - dev_err(&client->dev, "%s:report not supported\n",
> - __func__);
> + dev_err(&client->dev, "report not supported\n");
> } else
> touch = synpatics_rmi4_touchpad_report(pdata, rfi);
> return touch;
> @@ -545,8 +542,7 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata,
> queries,
> sizeof(queries));
> if (retval != sizeof(queries)) {
> - dev_err(&client->dev, "%s:read function query registers\n",
> - __func__);
> + dev_err(&client->dev, "read function query registers\n");
> return retval;
> }
> /*
> @@ -670,16 +666,14 @@ static int synaptics_rmi4_touchpad_config(struct synaptics_rmi4_data *pdata,
> rfi->fn_desc.query_base_addr,
> data, QUERY_LEN);
> if (retval != QUERY_LEN)
> - dev_err(&client->dev, "%s:read query registers failed\n",
> - __func__);
> + dev_err(&client->dev, "read query registers failed\n");
> else {
> retval = synaptics_rmi4_i2c_block_read(pdata,
> rfi->fn_desc.ctrl_base_addr,
> data, DATA_BUF_LEN);
> if (retval != DATA_BUF_LEN) {
> dev_err(&client->dev,
> - "%s:read control registers failed\n",
> - __func__);
> + "read control registers failed\n");
> return retval;
> }
> /* Store these for use later*/
> @@ -727,7 +721,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
> sizeof(rmi_fd));
> if (retval != sizeof(rmi_fd)) {
> /* failed to read next PDT entry */
> - dev_err(&client->dev, "%s: read error\n", __func__);
> + dev_err(&client->dev, "read error\n");
> return -EIO;
> }
> rfi = NULL;
> @@ -799,8 +793,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
> std_queries,
> sizeof(std_queries));
> if (retval != sizeof(std_queries)) {
> - dev_err(&client->dev, "%s:Failed reading queries\n",
> - __func__);
> + dev_err(&client->dev, "Failed reading queries\n");
> return -EIO;
> }
>
> @@ -847,8 +840,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
> return retval;
> } else
> dev_err(&client->dev,
> - "%s:fn_number not supported\n",
> - __func__);
> + "fn_number not supported\n");
> /*
> * Turn on interrupts for this
> * function's data sources.
> @@ -919,15 +911,13 @@ static int synaptics_rmi4_probe
>
> rmi4_data->regulator = regulator_get(&client->dev, "vdd");
> if (IS_ERR(rmi4_data->regulator)) {
> - dev_err(&client->dev, "%s:get regulator failed\n",
> - __func__);
> + dev_err(&client->dev, "get regulator failed\n");
> retval = PTR_ERR(rmi4_data->regulator);
> goto err_get_regulator;
> }
> retval = regulator_enable(rmi4_data->regulator);
> if (retval < 0) {
> - dev_err(&client->dev, "%s:regulator enable failed\n",
> - __func__);
> + dev_err(&client->dev, "regulator enable failed\n");
> goto err_regulator_enable;
> }
> init_waitqueue_head(&rmi4_data->wait);
> @@ -952,8 +942,7 @@ static int synaptics_rmi4_probe
> */
> retval = synaptics_rmi4_i2c_query_device(rmi4_data);
> if (retval) {
> - dev_err(&client->dev, "%s: rmi4 query device failed\n",
> - __func__);
> + dev_err(&client->dev, "rmi4 query device failed\n");
> goto err_query_dev;
> }
>
> @@ -997,7 +986,7 @@ static int synaptics_rmi4_probe
>
> retval = input_register_device(rmi4_data->input_dev);
> if (retval) {
> - dev_err(&client->dev, "%s:input register failed\n", __func__);
> + dev_err(&client->dev, "input register failed\n");
> goto err_free_irq;
> }
>
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1425584605-28448-1-git-send-email-hamohammed.sa%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [Outreachy kernel] [PATCH 7/7] Staging: ste_rmi4: Clean dev_err() logging
2015-03-05 20:40 ` [Outreachy kernel] " Julia Lawall
@ 2015-03-05 21:02 ` Haneen Mohammed
0 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:02 UTC (permalink / raw)
To: Julia Lawall, outreachy-kernel
On Thu, Mar 05, 2015 at 03:40:32PM -0500, Julia Lawall wrote:
> On Thu, 5 Mar 2015, Haneen Mohammed wrote:
>
> > This patch removes __func__ from dev_err. dev_err includes information about:
> > (devcice, driver, specific instance of device, etc) in the log printout, so there is no need for __func__.
> > This was done using Coccinelle, with the following semantic patch:
> >
> > @a@
> > expression E;
> > expression msg;
> > @@
> >
> > dev_err(E, msg, __func__);
> >
> > @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;
>
> Clever! Does it give false positives? Or maybe false negatives (not
> finding all cases).
>
> julia
>
Yes, I think I ignored the case when __func__ isn't the last argument.
but I just fixed that with this:
@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);
> > @c@
> > expression a.E, a.msg;
> > identifier b.y;
> > @@
> >
> > - dev_err(E, msg, __func__);
> > + dev_err(E, y);
> >
> > Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
> > ---
> > drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 37 ++++++++++-----------------
> > 1 file changed, 13 insertions(+), 24 deletions(-)
> >
> > diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> > index f92ae1d..508f8e1 100644
> > --- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> > +++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> > @@ -339,8 +339,7 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
> > retval = synaptics_rmi4_i2c_block_read(pdata, data_base_addr, values,
> > finger_registers);
> > if (retval != finger_registers) {
> > - dev_err(&client->dev, "%s:read status registers failed\n",
> > - __func__);
> > + dev_err(&client->dev, "read status registers failed\n");
> > return 0;
> > }
> > /*
> > @@ -371,8 +370,7 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
> > data_offset, data,
> > data_reg_blk_size);
> > if (retval != data_reg_blk_size) {
> > - dev_err(&client->dev, "%s:read data failed\n",
> > - __func__);
> > + dev_err(&client->dev, "read data failed\n");
> > return 0;
> > }
> > x = (data[0] << 4) | (data[2] & MASK_4BIT);
> > @@ -419,8 +417,7 @@ static int synaptics_rmi4_report_device(struct synaptics_rmi4_data *pdata,
> > if (rfi->fn_number != SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM) {
> > num_error_reports++;
> > if (num_error_reports < MAX_ERROR_REPORT)
> > - dev_err(&client->dev, "%s:report not supported\n",
> > - __func__);
> > + dev_err(&client->dev, "report not supported\n");
> > } else
> > touch = synpatics_rmi4_touchpad_report(pdata, rfi);
> > return touch;
> > @@ -545,8 +542,7 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata,
> > queries,
> > sizeof(queries));
> > if (retval != sizeof(queries)) {
> > - dev_err(&client->dev, "%s:read function query registers\n",
> > - __func__);
> > + dev_err(&client->dev, "read function query registers\n");
> > return retval;
> > }
> > /*
> > @@ -670,16 +666,14 @@ static int synaptics_rmi4_touchpad_config(struct synaptics_rmi4_data *pdata,
> > rfi->fn_desc.query_base_addr,
> > data, QUERY_LEN);
> > if (retval != QUERY_LEN)
> > - dev_err(&client->dev, "%s:read query registers failed\n",
> > - __func__);
> > + dev_err(&client->dev, "read query registers failed\n");
> > else {
> > retval = synaptics_rmi4_i2c_block_read(pdata,
> > rfi->fn_desc.ctrl_base_addr,
> > data, DATA_BUF_LEN);
> > if (retval != DATA_BUF_LEN) {
> > dev_err(&client->dev,
> > - "%s:read control registers failed\n",
> > - __func__);
> > + "read control registers failed\n");
> > return retval;
> > }
> > /* Store these for use later*/
> > @@ -727,7 +721,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
> > sizeof(rmi_fd));
> > if (retval != sizeof(rmi_fd)) {
> > /* failed to read next PDT entry */
> > - dev_err(&client->dev, "%s: read error\n", __func__);
> > + dev_err(&client->dev, "read error\n");
> > return -EIO;
> > }
> > rfi = NULL;
> > @@ -799,8 +793,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
> > std_queries,
> > sizeof(std_queries));
> > if (retval != sizeof(std_queries)) {
> > - dev_err(&client->dev, "%s:Failed reading queries\n",
> > - __func__);
> > + dev_err(&client->dev, "Failed reading queries\n");
> > return -EIO;
> > }
> >
> > @@ -847,8 +840,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
> > return retval;
> > } else
> > dev_err(&client->dev,
> > - "%s:fn_number not supported\n",
> > - __func__);
> > + "fn_number not supported\n");
> > /*
> > * Turn on interrupts for this
> > * function's data sources.
> > @@ -919,15 +911,13 @@ static int synaptics_rmi4_probe
> >
> > rmi4_data->regulator = regulator_get(&client->dev, "vdd");
> > if (IS_ERR(rmi4_data->regulator)) {
> > - dev_err(&client->dev, "%s:get regulator failed\n",
> > - __func__);
> > + dev_err(&client->dev, "get regulator failed\n");
> > retval = PTR_ERR(rmi4_data->regulator);
> > goto err_get_regulator;
> > }
> > retval = regulator_enable(rmi4_data->regulator);
> > if (retval < 0) {
> > - dev_err(&client->dev, "%s:regulator enable failed\n",
> > - __func__);
> > + dev_err(&client->dev, "regulator enable failed\n");
> > goto err_regulator_enable;
> > }
> > init_waitqueue_head(&rmi4_data->wait);
> > @@ -952,8 +942,7 @@ static int synaptics_rmi4_probe
> > */
> > retval = synaptics_rmi4_i2c_query_device(rmi4_data);
> > if (retval) {
> > - dev_err(&client->dev, "%s: rmi4 query device failed\n",
> > - __func__);
> > + dev_err(&client->dev, "rmi4 query device failed\n");
> > goto err_query_dev;
> > }
> >
> > @@ -997,7 +986,7 @@ static int synaptics_rmi4_probe
> >
> > retval = input_register_device(rmi4_data->input_dev);
> > if (retval) {
> > - dev_err(&client->dev, "%s:input register failed\n", __func__);
> > + dev_err(&client->dev, "input register failed\n");
> > goto err_free_irq;
> > }
> >
> > --
> > 1.9.1
> >
> > --
> > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1425584605-28448-1-git-send-email-hamohammed.sa%40gmail.com.
> > For more options, visit https://groups.google.com/d/optout.
> >
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v2 0/7] Staging: clean de_err() loging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (6 preceding siblings ...)
2015-03-05 19:43 ` [PATCH 7/7] Staging: ste_rmi4: " Haneen Mohammed
@ 2015-03-05 21:29 ` Haneen Mohammed
2015-03-05 21:36 ` [PATCH v3 0/7]Staging: " Haneen Mohammed
` (7 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:29 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
changes in v2: remove "git base -i" coccinelle code placed by mistake.
This patchset 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;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Haneen Mohammed (7):
Staging: comedi: Clean dev_err() logging
Staging: media: Clean dev_err() logging
Staging: fbtft: Clean dev_err() logging
Staging: iio: Clean dev_err() logging
Staging: octeon-usb: Clean dev_err() logging
Staging: slicoss: Clean dev_err() logging
Staging: gdm72xx: Clean dev_err() logging
drivers/staging/comedi/drivers/cb_pcidas64.c | 6 ++--
drivers/staging/comedi/drivers/ni_mio_common.c | 36 +++++++++---------------
drivers/staging/fbtft/fb_ra8875.c | 3 +-
drivers/staging/fbtft/fb_ssd1351.c | 3 +-
drivers/staging/fbtft/fb_watterott.c | 3 +-
drivers/staging/fbtft/fbtft-bus.c | 4 +--
drivers/staging/fbtft/fbtft-core.c | 14 ++++------
drivers/staging/fbtft/fbtft-io.c | 11 +++-----
drivers/staging/gdm72xx/gdm_usb.c | 4 +--
drivers/staging/iio/light/tsl2x7x_core.c | 38 +++++++++-----------------
drivers/staging/media/lirc/lirc_imon.c | 32 ++++++++--------------
drivers/staging/media/lirc/lirc_sasem.c | 25 ++++++-----------
drivers/staging/media/lirc/lirc_zilog.c | 3 +-
drivers/staging/octeon-usb/octeon-hcd.c | 2 +-
drivers/staging/slicoss/slicoss.c | 14 ++++------
15 files changed, 73 insertions(+), 125 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 0/7]Staging: clean de_err() loging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (7 preceding siblings ...)
2015-03-05 21:29 ` [PATCH v2 0/7] Staging: clean de_err() loging Haneen Mohammed
@ 2015-03-05 21:36 ` Haneen Mohammed
2015-03-05 21:42 ` [PATCH v3 1/7] Staging: media: Clean dev_err() logging Haneen Mohammed
` (6 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:36 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
changes in v3: correct patches order from stage:media instead of stages:comedi
changes in v2: remove "git base -i" coccinelle code placed by mistake.
This patchset 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;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Haneen Mohammed (7):
Staging: media: Clean dev_err() logging
Staging: fbtft: Clean dev_err() logging
Staging: iio: Clean dev_err() logging
Staging: octeon-usb: Clean dev_err() logging
Staging: slicoss: Clean dev_err() logging
Staging: gdm72xx: Clean dev_err() logging
Staging: ste_rmi4: Clean dev_err() logging
drivers/staging/fbtft/fb_ra8875.c | 3 +--
drivers/staging/fbtft/fb_ssd1351.c | 3 +--
drivers/staging/fbtft/fb_watterott.c | 3 +--
drivers/staging/fbtft/fbtft-bus.c | 4 +--
drivers/staging/fbtft/fbtft-core.c | 14 ++++------
drivers/staging/fbtft/fbtft-io.c | 11 +++-----
drivers/staging/gdm72xx/gdm_usb.c | 4 +--
drivers/staging/iio/light/tsl2x7x_core.c | 38 +++++++++------------------
drivers/staging/media/lirc/lirc_imon.c | 32 +++++++++-------------
drivers/staging/media/lirc/lirc_sasem.c | 25 +++++++-----------
drivers/staging/media/lirc/lirc_zilog.c | 3 +--
drivers/staging/octeon-usb/octeon-hcd.c | 2 +-
drivers/staging/slicoss/slicoss.c | 14 +++++-----
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 37 +++++++++-----------------
14 files changed, 71 insertions(+), 122 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v3 1/7] Staging: media: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (8 preceding siblings ...)
2015-03-05 21:36 ` [PATCH v3 0/7]Staging: " Haneen Mohammed
@ 2015-03-05 21:42 ` Haneen Mohammed
2015-03-06 23:52 ` [Outreachy kernel] " Greg KH
2015-03-05 21:44 ` [PATCH v3 2/7] Staging: fbtft: " Haneen Mohammed
` (5 subsequent siblings)
15 siblings, 1 reply; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:42 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/media/lirc/lirc_imon.c | 32 ++++++++++++--------------------
drivers/staging/media/lirc/lirc_sasem.c | 25 +++++++++----------------
drivers/staging/media/lirc/lirc_zilog.c | 3 +--
3 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c
index 9ce7d99..d490607 100644
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -251,12 +251,10 @@ static int display_open(struct inode *inode, struct file *file)
mutex_lock(&context->ctx_lock);
if (!context->display) {
- dev_err(&interface->dev,
- "%s: display not supported by device\n", __func__);
+ dev_err(&interface->dev, "display not supported by device\n");
retval = -ENODEV;
} else if (context->display_isopen) {
- dev_err(&interface->dev,
- "%s: display port is already open\n", __func__);
+ dev_err(&interface->dev, "display port is already open\n");
retval = -EBUSY;
} else {
context->display_isopen = 1;
@@ -291,11 +289,10 @@ static int display_close(struct inode *inode, struct file *file)
if (!context->display) {
dev_err(&context->usbdev->dev,
- "%s: display not supported by device\n", __func__);
+ "display not supported by device\n");
retval = -ENODEV;
} else if (!context->display_isopen) {
- dev_err(&context->usbdev->dev,
- "%s: display is not open\n", __func__);
+ dev_err(&context->usbdev->dev, "display is not open\n");
retval = -EIO;
} else {
context->display_isopen = 0;
@@ -352,8 +349,7 @@ static int send_packet(struct imon_context *context)
retval = wait_for_completion_interruptible(
&context->tx.finished);
if (retval)
- dev_err(&context->usbdev->dev,
- "%s: task interrupted\n", __func__);
+ dev_err(&context->usbdev->dev, "task interrupted\n");
mutex_lock(&context->ctx_lock);
retval = context->tx.status;
@@ -398,15 +394,13 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,
mutex_lock(&context->ctx_lock);
if (!context->dev_present) {
- dev_err(&context->usbdev->dev,
- "%s: no iMON device present\n", __func__);
+ dev_err(&context->usbdev->dev, "no iMON device present\n");
retval = -ENODEV;
goto exit;
}
if (n_bytes <= 0 || n_bytes > IMON_DATA_BUF_SZ - 3) {
- dev_err(&context->usbdev->dev,
- "%s: invalid payload size\n", __func__);
+ dev_err(&context->usbdev->dev, "invalid payload size\n");
retval = -EINVAL;
goto exit;
}
@@ -775,8 +769,7 @@ static int imon_probe(struct usb_interface *interface,
/* Input endpoint is mandatory */
if (!ir_ep_found) {
- dev_err(dev, "%s: no valid input (IR) endpoint found.\n",
- __func__);
+ dev_err(dev, "no valid input (IR) endpoint found.\n");
retval = -ENODEV;
alloc_status = 2;
goto alloc_status_switch;
@@ -802,20 +795,19 @@ static int imon_probe(struct usb_interface *interface,
goto alloc_status_switch;
}
if (lirc_buffer_init(rbuf, BUF_CHUNK_SIZE, BUF_SIZE)) {
- dev_err(dev, "%s: lirc_buffer_init failed\n", __func__);
+ dev_err(dev, "lirc_buffer_init failed\n");
alloc_status = 4;
goto alloc_status_switch;
}
rx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!rx_urb) {
- dev_err(dev, "%s: usb_alloc_urb failed for IR urb\n", __func__);
+ dev_err(dev, "usb_alloc_urb failed for IR urb\n");
alloc_status = 5;
goto alloc_status_switch;
}
tx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!tx_urb) {
- dev_err(dev, "%s: usb_alloc_urb failed for display urb\n",
- __func__);
+ dev_err(dev, "usb_alloc_urb failed for display urb\n");
alloc_status = 6;
goto alloc_status_switch;
}
@@ -842,7 +834,7 @@ static int imon_probe(struct usb_interface *interface,
lirc_minor = lirc_register_driver(driver);
if (lirc_minor < 0) {
- dev_err(dev, "%s: lirc_register_driver failed\n", __func__);
+ dev_err(dev, "lirc_register_driver failed\n");
alloc_status = 7;
goto unlock;
} else
diff --git a/drivers/staging/media/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c
index 4a26820..b7261b3 100644
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -224,8 +224,7 @@ static int vfd_open(struct inode *inode, struct file *file)
mutex_lock(&context->ctx_lock);
if (context->vfd_isopen) {
- dev_err(&interface->dev,
- "%s: VFD port is already open", __func__);
+ dev_err(&interface->dev, "VFD port is already open");
retval = -EBUSY;
} else {
context->vfd_isopen = 1;
@@ -292,7 +291,7 @@ static int vfd_close(struct inode *inode, struct file *file)
mutex_lock(&context->ctx_lock);
if (!context->vfd_isopen) {
- dev_err(&context->dev->dev, "%s: VFD is not open\n", __func__);
+ dev_err(&context->dev->dev, "VFD is not open\n");
retval = -EIO;
} else {
context->vfd_isopen = 0;
@@ -383,8 +382,7 @@ static ssize_t vfd_write(struct file *file, const char __user *buf,
}
if (n_bytes <= 0 || n_bytes > SASEM_DATA_BUF_SZ) {
- dev_err(&context->dev->dev, "%s: invalid payload size\n",
- __func__);
+ dev_err(&context->dev->dev, "invalid payload size\n");
retval = -EINVAL;
goto exit;
}
@@ -493,8 +491,7 @@ static int ir_open(void *data)
mutex_lock(&context->ctx_lock);
if (context->ir_isopen) {
- dev_err(&context->dev->dev, "%s: IR port is already open\n",
- __func__);
+ dev_err(&context->dev->dev, "IR port is already open\n");
retval = -EBUSY;
goto exit;
}
@@ -734,7 +731,7 @@ static int sasem_probe(struct usb_interface *interface,
/* Input endpoint is mandatory */
if (!ir_ep_found) {
dev_err(&interface->dev,
- "%s: no valid input (IR) endpoint found.\n", __func__);
+ "no valid input (IR) endpoint found.\n");
retval = -ENODEV;
goto exit;
}
@@ -764,15 +761,13 @@ static int sasem_probe(struct usb_interface *interface,
goto alloc_status_switch;
}
if (lirc_buffer_init(rbuf, BUF_CHUNK_SIZE, BUF_SIZE)) {
- dev_err(&interface->dev,
- "%s: lirc_buffer_init failed\n", __func__);
+ dev_err(&interface->dev, "lirc_buffer_init failed\n");
alloc_status = 4;
goto alloc_status_switch;
}
rx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!rx_urb) {
- dev_err(&interface->dev,
- "%s: usb_alloc_urb failed for IR urb\n", __func__);
+ dev_err(&interface->dev, "usb_alloc_urb failed for IR urb\n");
alloc_status = 5;
goto alloc_status_switch;
}
@@ -780,8 +775,7 @@ static int sasem_probe(struct usb_interface *interface,
tx_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!tx_urb) {
dev_err(&interface->dev,
- "%s: usb_alloc_urb failed for VFD urb",
- __func__);
+ "usb_alloc_urb failed for VFD urb");
alloc_status = 6;
goto alloc_status_switch;
}
@@ -805,8 +799,7 @@ static int sasem_probe(struct usb_interface *interface,
lirc_minor = lirc_register_driver(driver);
if (lirc_minor < 0) {
- dev_err(&interface->dev,
- "%s: lirc_register_driver failed\n", __func__);
+ dev_err(&interface->dev, "lirc_register_driver failed\n");
alloc_status = 7;
retval = lirc_minor;
goto unlock;
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index e16627c..abcc9e4 100644
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -1590,8 +1590,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
if (IS_ERR(rx->task)) {
ret = PTR_ERR(rx->task);
dev_err(tx->ir->l.dev,
- "%s: could not start IR Rx polling thread\n",
- __func__);
+ "could not start IR Rx polling thread\n");
/* Failed kthread, so put back the ir ref */
put_ir_device(ir, true);
/* Failure exit, so put back rx ref from i2c_client */
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 2/7] Staging: fbtft: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (9 preceding siblings ...)
2015-03-05 21:42 ` [PATCH v3 1/7] Staging: media: Clean dev_err() logging Haneen Mohammed
@ 2015-03-05 21:44 ` Haneen Mohammed
2015-03-05 21:46 ` [PATCH v3 3/7] Staging: iio: " Haneen Mohammed
` (4 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:44 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/fbtft/fb_ra8875.c | 3 +--
drivers/staging/fbtft/fb_ssd1351.c | 3 +--
drivers/staging/fbtft/fb_watterott.c | 3 +--
drivers/staging/fbtft/fbtft-bus.c | 4 ++--
drivers/staging/fbtft/fbtft-core.c | 14 +++++---------
drivers/staging/fbtft/fbtft-io.c | 11 ++++-------
6 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/fbtft/fb_ra8875.c b/drivers/staging/fbtft/fb_ra8875.c
index 8df9737..a186458 100644
--- a/drivers/staging/fbtft/fb_ra8875.c
+++ b/drivers/staging/fbtft/fb_ra8875.c
@@ -52,8 +52,7 @@ static int write_spi(struct fbtft_par *par, void *buf, size_t len)
"%s(len=%d): ", __func__, len);
if (!par->spi) {
- dev_err(par->info->device,
- "%s: par->spi is unexpectedly NULL\n", __func__);
+ dev_err(par->info->device, "par->spi is unexpectedly NULL\n");
return -1;
}
diff --git a/drivers/staging/fbtft/fb_ssd1351.c b/drivers/staging/fbtft/fb_ssd1351.c
index b59120c..b925dd5 100644
--- a/drivers/staging/fbtft/fb_ssd1351.c
+++ b/drivers/staging/fbtft/fb_ssd1351.c
@@ -220,8 +220,7 @@ static void register_onboard_backlight(struct fbtft_par *par)
GFP_KERNEL);
if (!bl_ops) {
dev_err(par->info->device,
- "%s: could not allocate memory for backlight operations.\n",
- __func__);
+ "could not allocate memory for backlight operations.\n");
return;
}
diff --git a/drivers/staging/fbtft/fb_watterott.c b/drivers/staging/fbtft/fb_watterott.c
index 975b579..5e6595f 100644
--- a/drivers/staging/fbtft/fb_watterott.c
+++ b/drivers/staging/fbtft/fb_watterott.c
@@ -269,8 +269,7 @@ static void register_chip_backlight(struct fbtft_par *par)
GFP_KERNEL);
if (!bl_ops) {
dev_err(par->info->device,
- "%s: could not allocate memory for backlight operations.\n",
- __func__);
+ "could not allocate memory for backlight operations.\n");
return;
}
diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/staging/fbtft/fbtft-bus.c
index b3cddb0..4b9a481 100644
--- a/drivers/staging/fbtft/fbtft-bus.c
+++ b/drivers/staging/fbtft/fbtft-bus.c
@@ -196,7 +196,7 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len)
__func__, offset, len);
if (!par->txbuf.buf) {
- dev_err(par->info->device, "%s: txbuf.buf is NULL\n", __func__);
+ dev_err(par->info->device, "txbuf.buf is NULL\n");
return -1;
}
@@ -232,7 +232,7 @@ EXPORT_SYMBOL(fbtft_write_vmem16_bus9);
int fbtft_write_vmem8_bus8(struct fbtft_par *par, size_t offset, size_t len)
{
- dev_err(par->info->device, "%s: function not implemented\n", __func__);
+ dev_err(par->info->device, "function not implemented\n");
return -1;
}
EXPORT_SYMBOL(fbtft_write_vmem8_bus8);
diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
index e8d8d07..f0164218 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -304,8 +304,7 @@ void fbtft_register_backlight(struct fbtft_par *par)
GFP_KERNEL);
if (!bl_ops) {
dev_err(par->info->device,
- "%s: could not allocate memeory for backlight operations.\n",
- __func__);
+ "could not allocate memeory for backlight operations.\n");
return;
}
@@ -414,8 +413,7 @@ static void fbtft_update_display(struct fbtft_par *par, unsigned start_line,
ret = par->fbtftops.write_vmem(par, offset, len);
if (ret < 0)
dev_err(par->info->device,
- "%s: write_vmem failed to update display buffer\n",
- __func__);
+ "write_vmem failed to update display buffer\n");
if (unlikely(timeit)) {
getnstimeofday(&ts_end);
@@ -1091,8 +1089,7 @@ static int fbtft_init_display_dt(struct fbtft_par *par)
while (p && !(val & 0xFFFF0000)) {
if (i > 63) {
dev_err(par->info->device,
- "%s: Maximum register values exceeded\n",
- __func__);
+ "Maximum register values exceeded\n");
return -EINVAL;
}
buf[i++] = val;
@@ -1216,8 +1213,7 @@ int fbtft_init_display(struct fbtft_par *par)
while (par->init_sequence[i] >= 0) {
if (j > 63) {
dev_err(par->info->device,
- "%s: Maximum register values exceeded\n",
- __func__);
+ "Maximum register values exceeded\n");
return -EINVAL;
}
buf[j++] = par->init_sequence[i++];
@@ -1255,7 +1251,7 @@ int fbtft_init_display(struct fbtft_par *par)
}
dev_err(par->info->device,
- "%s: something is wrong. Shouldn't get here.\n", __func__);
+ "something is wrong. Shouldn't get here.\n");
return -EINVAL;
}
EXPORT_SYMBOL(fbtft_init_display);
diff --git a/drivers/staging/fbtft/fbtft-io.c b/drivers/staging/fbtft/fbtft-io.c
index 9b2f8cf..17ab078 100644
--- a/drivers/staging/fbtft/fbtft-io.c
+++ b/drivers/staging/fbtft/fbtft-io.c
@@ -16,8 +16,7 @@ int fbtft_write_spi(struct fbtft_par *par, void *buf, size_t len)
"%s(len=%d): ", __func__, len);
if (!par->spi) {
- dev_err(par->info->device,
- "%s: par->spi is unexpectedly NULL\n", __func__);
+ dev_err(par->info->device, "par->spi is unexpectedly NULL\n");
return -1;
}
@@ -53,8 +52,7 @@ int fbtft_write_spi_emulate_9(struct fbtft_par *par, void *buf, size_t len)
"%s(len=%d): ", __func__, len);
if (!par->extra) {
- dev_err(par->info->device, "%s: error: par->extra is NULL\n",
- __func__);
+ dev_err(par->info->device, "error: par->extra is NULL\n");
return -EINVAL;
}
if ((len % 8) != 0) {
@@ -98,8 +96,7 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t len)
struct spi_message m;
if (!par->spi) {
- dev_err(par->info->device,
- "%s: par->spi is unexpectedly NULL\n", __func__);
+ dev_err(par->info->device, "par->spi is unexpectedly NULL\n");
return -ENODEV;
}
@@ -233,7 +230,7 @@ EXPORT_SYMBOL(fbtft_write_gpio16_wr);
int fbtft_write_gpio16_wr_latched(struct fbtft_par *par, void *buf, size_t len)
{
- dev_err(par->info->device, "%s: function not implemented\n", __func__);
+ dev_err(par->info->device, "function not implemented\n");
return -1;
}
EXPORT_SYMBOL(fbtft_write_gpio16_wr_latched);
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 3/7] Staging: iio: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (10 preceding siblings ...)
2015-03-05 21:44 ` [PATCH v3 2/7] Staging: fbtft: " Haneen Mohammed
@ 2015-03-05 21:46 ` Haneen Mohammed
2015-03-05 21:48 ` [PATCH v3 4/7] Staging: octeon-usb: " Haneen Mohammed
` (3 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:46 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/iio/light/tsl2x7x_core.c | 38 +++++++++++---------------------
1 file changed, 13 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c
index 4a5dc26..1222a57 100644
--- a/drivers/staging/iio/light/tsl2x7x_core.c
+++ b/drivers/staging/iio/light/tsl2x7x_core.c
@@ -350,8 +350,7 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
if (chip->tsl2x7x_chip_status != TSL2X7X_CHIP_WORKING) {
/* device is not enabled */
- dev_err(&chip->client->dev, "%s: device is not enabled\n",
- __func__);
+ dev_err(&chip->client->dev, "device is not enabled\n");
ret = -EBUSY;
goto out_unlock;
}
@@ -359,14 +358,12 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev)
ret = tsl2x7x_i2c_read(chip->client,
(TSL2X7X_CMD_REG | TSL2X7X_STATUS), &buf[0]);
if (ret < 0) {
- dev_err(&chip->client->dev,
- "%s: Failed to read STATUS Reg\n", __func__);
+ dev_err(&chip->client->dev, "Failed to read STATUS Reg\n");
goto out_unlock;
}
/* is data new & valid */
if (!(buf[0] & TSL2X7X_STA_ADC_VALID)) {
- dev_err(&chip->client->dev,
- "%s: data not valid yet\n", __func__);
+ dev_err(&chip->client->dev, "data not valid yet\n");
ret = chip->als_cur_info.lux; /* return LAST VALUE */
goto out_unlock;
}
@@ -485,8 +482,7 @@ static int tsl2x7x_get_prox(struct iio_dev *indio_dev)
struct tsl2X7X_chip *chip = iio_priv(indio_dev);
if (mutex_trylock(&chip->prox_mutex) == 0) {
- dev_err(&chip->client->dev,
- "%s: Can't get prox mutex\n", __func__);
+ dev_err(&chip->client->dev, "Can't get prox mutex\n");
return -EBUSY;
}
@@ -591,8 +587,7 @@ static int tsl2x7x_als_calibrate(struct iio_dev *indio_dev)
reg_val = i2c_smbus_read_byte(chip->client);
if ((reg_val & (TSL2X7X_CNTL_ADC_ENBL | TSL2X7X_CNTL_PWR_ON))
!= (TSL2X7X_CNTL_ADC_ENBL | TSL2X7X_CNTL_PWR_ON)) {
- dev_err(&chip->client->dev,
- "%s: failed: ADC not enabled\n", __func__);
+ dev_err(&chip->client->dev, "failed: ADC not enabled\n");
return -1;
}
@@ -608,14 +603,13 @@ static int tsl2x7x_als_calibrate(struct iio_dev *indio_dev)
reg_val = i2c_smbus_read_byte(chip->client);
if ((reg_val & TSL2X7X_STA_ADC_VALID) != TSL2X7X_STA_ADC_VALID) {
dev_err(&chip->client->dev,
- "%s: failed: STATUS - ADC not valid.\n", __func__);
+ "failed: STATUS - ADC not valid.\n");
return -ENODATA;
}
lux_val = tsl2x7x_get_lux(indio_dev);
if (lux_val < 0) {
- dev_err(&chip->client->dev,
- "%s: failed to get lux\n", __func__);
+ dev_err(&chip->client->dev, "failed to get lux\n");
return lux_val;
}
@@ -707,8 +701,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
ret = i2c_smbus_write_byte_data(chip->client,
TSL2X7X_CMD_REG | TSL2X7X_CNTRL, utmp);
if (ret < 0) {
- dev_err(&chip->client->dev,
- "%s: failed on CNTRL reg.\n", __func__);
+ dev_err(&chip->client->dev, "failed on CNTRL reg.\n");
return ret;
}
@@ -735,8 +728,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
ret = i2c_smbus_write_byte_data(chip->client,
TSL2X7X_CMD_REG | TSL2X7X_CNTRL, utmp);
if (ret < 0) {
- dev_err(&chip->client->dev,
- "%s: failed on 2nd CTRL reg.\n", __func__);
+ dev_err(&chip->client->dev, "failed on 2nd CTRL reg.\n");
return ret;
}
@@ -755,8 +747,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
(TSL2X7X_CMD_REG | TSL2X7X_CNTRL), reg_val);
if (ret < 0)
dev_err(&chip->client->dev,
- "%s: failed in tsl2x7x_IOCTL_INT_SET.\n",
- __func__);
+ "failed in tsl2x7x_IOCTL_INT_SET.\n");
/* Clear out any initial interrupts */
ret = i2c_smbus_write_byte(chip->client,
@@ -764,8 +755,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
TSL2X7X_CMD_PROXALS_INT_CLR);
if (ret < 0) {
dev_err(&chip->client->dev,
- "%s: Failed to clear Int status\n",
- __func__);
+ "Failed to clear Int status\n");
return ret;
}
}
@@ -1925,8 +1915,7 @@ static int tsl2x7x_probe(struct i2c_client *clientp,
"TSL2X7X_event",
indio_dev);
if (ret) {
- dev_err(&clientp->dev,
- "%s: irq request failed", __func__);
+ dev_err(&clientp->dev, "irq request failed");
return ret;
}
}
@@ -1938,8 +1927,7 @@ static int tsl2x7x_probe(struct i2c_client *clientp,
ret = iio_device_register(indio_dev);
if (ret) {
- dev_err(&clientp->dev,
- "%s: iio registration failed\n", __func__);
+ dev_err(&clientp->dev, "iio registration failed\n");
return ret;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 4/7] Staging: octeon-usb: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (11 preceding siblings ...)
2015-03-05 21:46 ` [PATCH v3 3/7] Staging: iio: " Haneen Mohammed
@ 2015-03-05 21:48 ` Haneen Mohammed
2015-03-05 21:50 ` [PATCH v3 5/7] Staging: slicoss: " Haneen Mohammed
` (2 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:48 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/octeon-usb/octeon-hcd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c
index 1daeb31..e892de2 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -1531,7 +1531,7 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb,
switch (transaction->stage) {
case CVMX_USB_STAGE_NON_CONTROL:
case CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE:
- dev_err(dev, "%s: ERROR - Non control stage\n", __func__);
+ dev_err(dev, "ERROR - Non control stage\n");
break;
case CVMX_USB_STAGE_SETUP:
usbc_hctsiz.s.pid = 3; /* Setup */
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 5/7] Staging: slicoss: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (12 preceding siblings ...)
2015-03-05 21:48 ` [PATCH v3 4/7] Staging: octeon-usb: " Haneen Mohammed
@ 2015-03-05 21:50 ` Haneen Mohammed
2015-03-05 21:52 ` [PATCH v3 6/7] Staging: gdm72xx: " Haneen Mohammed
2015-03-05 21:55 ` [PATCH v3 7/7] Staging: ste_rmi4: " Haneen Mohammed
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:50 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/slicoss/slicoss.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 45f6a5f..2923b2c 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -1529,8 +1529,8 @@ retry_rcvqfill:
skb->next = NULL;
#ifdef KLUDGE_FOR_4GB_BOUNDARY
if (paddrl == 0) {
- dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
- __func__);
+ dev_err(dev,
+ "LOW 32bits PHYSICAL ADDRESS == 0\n");
dev_err(dev, "skb[%p] PROBLEM\n", skb);
dev_err(dev, " skbdata[%p]\n",
skb->data);
@@ -1549,8 +1549,8 @@ retry_rcvqfill:
}
#else
if (paddrl == 0) {
- dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
- __func__);
+ dev_err(dev,
+ "LOW 32bits PHYSICAL ADDRESS == 0\n");
dev_err(dev, "skb[%p] PROBLEM\n", skb);
dev_err(dev, " skbdata[%p]\n",
skb->data);
@@ -1685,8 +1685,7 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
if (paddrl == 0) {
dev = &adapter->netdev->dev;
- dev_err(dev, "%s: LOW 32bits PHYSICAL ADDRESS == 0\n",
- __func__);
+ dev_err(dev, "LOW 32bits PHYSICAL ADDRESS == 0\n");
dev_err(dev, "skb[%p] PROBLEM\n", skb);
dev_err(dev, " skbdata[%p]\n", skb->data);
dev_err(dev, " skblen[%x]\n", skb->len);
@@ -2293,8 +2292,7 @@ static int slic_if_init(struct adapter *adapter)
/* adapter should be down at this point */
if (adapter->state != ADAPT_DOWN) {
- dev_err(&dev->dev, "%s: adapter->state != ADAPT_DOWN\n",
- __func__);
+ dev_err(&dev->dev, "adapter->state != ADAPT_DOWN\n");
rc = -EIO;
goto err;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 6/7] Staging: gdm72xx: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (13 preceding siblings ...)
2015-03-05 21:50 ` [PATCH v3 5/7] Staging: slicoss: " Haneen Mohammed
@ 2015-03-05 21:52 ` Haneen Mohammed
2015-03-05 21:55 ` [PATCH v3 7/7] Staging: ste_rmi4: " Haneen Mohammed
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:52 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
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;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/gdm72xx/gdm_usb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c
index eac2f34..5ca5f81 100644
--- a/drivers/staging/gdm72xx/gdm_usb.c
+++ b/drivers/staging/gdm72xx/gdm_usb.c
@@ -301,7 +301,7 @@ static int gdm_usb_send(void *priv_dev, void *data, int len,
#endif /* CONFIG_WIMAX_GDM72XX_K_MODE */
if (!udev->usbdev) {
- dev_err(&usbdev->dev, "%s: No such device\n", __func__);
+ dev_err(&usbdev->dev, "No such device\n");
return -ENODEV;
}
@@ -470,7 +470,7 @@ static int gdm_usb_receive(void *priv_dev,
unsigned long flags;
if (!udev->usbdev) {
- dev_err(&usbdev->dev, "%s: No such device\n", __func__);
+ dev_err(&usbdev->dev, "No such device\n");
return -ENODEV;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v3 7/7] Staging: ste_rmi4: Clean dev_err() logging
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
` (14 preceding siblings ...)
2015-03-05 21:52 ` [PATCH v3 6/7] Staging: gdm72xx: " Haneen Mohammed
@ 2015-03-05 21:55 ` Haneen Mohammed
15 siblings, 0 replies; 20+ messages in thread
From: Haneen Mohammed @ 2015-03-05 21:55 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
This patch removes __func__ from dev_err. dev_err includes information about:
(devcice, driver, specific instance of device, etc) in the log printout, so there is no need for __func__.
This was done using Coccinelle, with the following semantic patch:
@a@
expression E;
expression msg;
@@
dev_err(E, msg, __func__);
@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;
identifier b.y;
@@
- dev_err(E, msg, __func__);
+ dev_err(E, y);
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 37 ++++++++++-----------------
1 file changed, 13 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index f92ae1d..508f8e1 100644
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@ -339,8 +339,7 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
retval = synaptics_rmi4_i2c_block_read(pdata, data_base_addr, values,
finger_registers);
if (retval != finger_registers) {
- dev_err(&client->dev, "%s:read status registers failed\n",
- __func__);
+ dev_err(&client->dev, "read status registers failed\n");
return 0;
}
/*
@@ -371,8 +370,7 @@ static int synpatics_rmi4_touchpad_report(struct synaptics_rmi4_data *pdata,
data_offset, data,
data_reg_blk_size);
if (retval != data_reg_blk_size) {
- dev_err(&client->dev, "%s:read data failed\n",
- __func__);
+ dev_err(&client->dev, "read data failed\n");
return 0;
}
x = (data[0] << 4) | (data[2] & MASK_4BIT);
@@ -419,8 +417,7 @@ static int synaptics_rmi4_report_device(struct synaptics_rmi4_data *pdata,
if (rfi->fn_number != SYNAPTICS_RMI4_TOUCHPAD_FUNC_NUM) {
num_error_reports++;
if (num_error_reports < MAX_ERROR_REPORT)
- dev_err(&client->dev, "%s:report not supported\n",
- __func__);
+ dev_err(&client->dev, "report not supported\n");
} else
touch = synpatics_rmi4_touchpad_report(pdata, rfi);
return touch;
@@ -545,8 +542,7 @@ static int synpatics_rmi4_touchpad_detect(struct synaptics_rmi4_data *pdata,
queries,
sizeof(queries));
if (retval != sizeof(queries)) {
- dev_err(&client->dev, "%s:read function query registers\n",
- __func__);
+ dev_err(&client->dev, "read function query registers\n");
return retval;
}
/*
@@ -670,16 +666,14 @@ static int synaptics_rmi4_touchpad_config(struct synaptics_rmi4_data *pdata,
rfi->fn_desc.query_base_addr,
data, QUERY_LEN);
if (retval != QUERY_LEN)
- dev_err(&client->dev, "%s:read query registers failed\n",
- __func__);
+ dev_err(&client->dev, "read query registers failed\n");
else {
retval = synaptics_rmi4_i2c_block_read(pdata,
rfi->fn_desc.ctrl_base_addr,
data, DATA_BUF_LEN);
if (retval != DATA_BUF_LEN) {
dev_err(&client->dev,
- "%s:read control registers failed\n",
- __func__);
+ "read control registers failed\n");
return retval;
}
/* Store these for use later*/
@@ -727,7 +721,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
sizeof(rmi_fd));
if (retval != sizeof(rmi_fd)) {
/* failed to read next PDT entry */
- dev_err(&client->dev, "%s: read error\n", __func__);
+ dev_err(&client->dev, "read error\n");
return -EIO;
}
rfi = NULL;
@@ -799,8 +793,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
std_queries,
sizeof(std_queries));
if (retval != sizeof(std_queries)) {
- dev_err(&client->dev, "%s:Failed reading queries\n",
- __func__);
+ dev_err(&client->dev, "Failed reading queries\n");
return -EIO;
}
@@ -847,8 +840,7 @@ static int synaptics_rmi4_i2c_query_device(struct synaptics_rmi4_data *pdata)
return retval;
} else
dev_err(&client->dev,
- "%s:fn_number not supported\n",
- __func__);
+ "fn_number not supported\n");
/*
* Turn on interrupts for this
* function's data sources.
@@ -919,15 +911,13 @@ static int synaptics_rmi4_probe
rmi4_data->regulator = regulator_get(&client->dev, "vdd");
if (IS_ERR(rmi4_data->regulator)) {
- dev_err(&client->dev, "%s:get regulator failed\n",
- __func__);
+ dev_err(&client->dev, "get regulator failed\n");
retval = PTR_ERR(rmi4_data->regulator);
goto err_get_regulator;
}
retval = regulator_enable(rmi4_data->regulator);
if (retval < 0) {
- dev_err(&client->dev, "%s:regulator enable failed\n",
- __func__);
+ dev_err(&client->dev, "regulator enable failed\n");
goto err_regulator_enable;
}
init_waitqueue_head(&rmi4_data->wait);
@@ -952,8 +942,7 @@ static int synaptics_rmi4_probe
*/
retval = synaptics_rmi4_i2c_query_device(rmi4_data);
if (retval) {
- dev_err(&client->dev, "%s: rmi4 query device failed\n",
- __func__);
+ dev_err(&client->dev, "rmi4 query device failed\n");
goto err_query_dev;
}
@@ -997,7 +986,7 @@ static int synaptics_rmi4_probe
retval = input_register_device(rmi4_data->input_dev);
if (retval) {
- dev_err(&client->dev, "%s:input register failed\n", __func__);
+ dev_err(&client->dev, "input register failed\n");
goto err_free_irq;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [Outreachy kernel] [PATCH v3 1/7] Staging: media: Clean dev_err() logging
2015-03-05 21:42 ` [PATCH v3 1/7] Staging: media: Clean dev_err() logging Haneen Mohammed
@ 2015-03-06 23:52 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2015-03-06 23:52 UTC (permalink / raw)
To: Haneen Mohammed; +Cc: outreachy-kernel
On Fri, Mar 06, 2015 at 12:42:36AM +0300, Haneen Mohammed wrote:
> 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:
Not all patches in this series apply anymore. Please refresh against my
latest staging-testing branch and resend.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2015-03-07 10:56 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-05 19:29 [PATCH 0/7] Staging: clean de_err() loging Haneen Mohammed
2015-03-05 19:31 ` [PATCH 1/7] Staging: media: Clean dev_err() logging Haneen Mohammed
2015-03-05 19:35 ` [PATCH 2/7] Staging: fbtft: " Haneen Mohammed
2015-03-05 19:37 ` [PATCH 3/7] Staging: iio: " Haneen Mohammed
2015-03-05 19:38 ` [PATCH 4/7] Staging: octeon-usb: " Haneen Mohammed
2015-03-05 19:38 ` [PATCH 5/7] Staging: slicoss: " Haneen Mohammed
2015-03-05 19:42 ` [PATCH 6/7] Staging: gdm72xx: " Haneen Mohammed
2015-03-05 19:43 ` [PATCH 7/7] Staging: ste_rmi4: " Haneen Mohammed
2015-03-05 20:40 ` [Outreachy kernel] " Julia Lawall
2015-03-05 21:02 ` Haneen Mohammed
2015-03-05 21:29 ` [PATCH v2 0/7] Staging: clean de_err() loging Haneen Mohammed
2015-03-05 21:36 ` [PATCH v3 0/7]Staging: " Haneen Mohammed
2015-03-05 21:42 ` [PATCH v3 1/7] Staging: media: Clean dev_err() logging Haneen Mohammed
2015-03-06 23:52 ` [Outreachy kernel] " Greg KH
2015-03-05 21:44 ` [PATCH v3 2/7] Staging: fbtft: " Haneen Mohammed
2015-03-05 21:46 ` [PATCH v3 3/7] Staging: iio: " Haneen Mohammed
2015-03-05 21:48 ` [PATCH v3 4/7] Staging: octeon-usb: " Haneen Mohammed
2015-03-05 21:50 ` [PATCH v3 5/7] Staging: slicoss: " Haneen Mohammed
2015-03-05 21:52 ` [PATCH v3 6/7] Staging: gdm72xx: " Haneen Mohammed
2015-03-05 21:55 ` [PATCH v3 7/7] Staging: ste_rmi4: " Haneen Mohammed
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.