2012-10-10 12:20:43

by YAMANE Toshiaki

Subject: [PATCH] staging/comedi: Use pr_ or dev_ printks in drivers/serial2002.c

fixed below checkpatch warning.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...

and added pr_fmt.

Signed-off-by: YAMANE Toshiaki <[email protected]>
---
drivers/staging/comedi/drivers/serial2002.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 5bf84cf..cc4f6e7 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -31,6 +31,8 @@ Status: in development

*/

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include "../comedidev.h"

#include <linux/delay.h>
@@ -282,7 +284,7 @@ static struct serial_data serial_read(struct file *f, int timeout)

length++;
if (data < 0) {
- printk(KERN_ERR "serial2002 error\n");
+ pr_err("serial2002 error\n");
break;
} else if (data & 0x80) {
result.value = (result.value << 7) | (data & 0x7f);
@@ -355,7 +357,8 @@ static int serial_2002_open(struct comedi_device *dev)
devpriv->tty = filp_open(port, O_RDWR, 0);
if (IS_ERR(devpriv->tty)) {
result = (int)PTR_ERR(devpriv->tty);
- printk(KERN_ERR "serial_2002: file open error = %d\n", result);
+ dev_err(dev->class_dev,
+ "serial_2002: file open error = %d\n", result);
} else {
struct config_t {

--
1.7.9.5

2012-10-22 19:51:59

by Greg KH

Subject: Re: [PATCH] staging/comedi: Use pr_ or dev_ printks in drivers/serial2002.c

On Wed, Oct 10, 2012 at 09:20:33PM +0900, YAMANE Toshiaki wrote:
> fixed below checkpatch warning.
> - WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...
>
> and added pr_fmt.
>
> Signed-off-by: YAMANE Toshiaki <[email protected]>
> ---
> drivers/staging/comedi/drivers/serial2002.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
> index 5bf84cf..cc4f6e7 100644
> --- a/drivers/staging/comedi/drivers/serial2002.c
> +++ b/drivers/staging/comedi/drivers/serial2002.c
> @@ -31,6 +31,8 @@ Status: in development
>
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include "../comedidev.h"
>
> #include <linux/delay.h>
> @@ -282,7 +284,7 @@ static struct serial_data serial_read(struct file *f, int timeout)
>
> length++;
> if (data < 0) {
> - printk(KERN_ERR "serial2002 error\n");
> + pr_err("serial2002 error\n");

The "serial2002" word here is redundant.

> break;
> } else if (data & 0x80) {
> result.value = (result.value << 7) | (data & 0x7f);
> @@ -355,7 +357,8 @@ static int serial_2002_open(struct comedi_device *dev)
> devpriv->tty = filp_open(port, O_RDWR, 0);
> if (IS_ERR(devpriv->tty)) {
> result = (int)PTR_ERR(devpriv->tty);
> - printk(KERN_ERR "serial_2002: file open error = %d\n", result);
> + dev_err(dev->class_dev,
> + "serial_2002: file open error = %d\n", result);

Same here.

greg k-h

2012-10-25 00:16:58

by YAMANE Toshiaki

Subject: [PATCH v2] staging/comedi: Use pr_ or dev_ printks in drivers/serial2002.c

fixed below checkpatch warning.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...

and added pr_fmt.

Signed-off-by: YAMANE Toshiaki <[email protected]>
---
drivers/staging/comedi/drivers/serial2002.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 5bf84cf..91fb8b1 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -31,6 +31,8 @@ Status: in development

*/

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include "../comedidev.h"

#include <linux/delay.h>
@@ -282,7 +284,7 @@ static struct serial_data serial_read(struct file *f, int timeout)

length++;
if (data < 0) {
- printk(KERN_ERR "serial2002 error\n");
+ pr_err("Failed to read serial.\n");
break;
} else if (data & 0x80) {
result.value = (result.value << 7) | (data & 0x7f);
@@ -355,7 +357,7 @@ static int serial_2002_open(struct comedi_device *dev)
devpriv->tty = filp_open(port, O_RDWR, 0);
if (IS_ERR(devpriv->tty)) {
result = (int)PTR_ERR(devpriv->tty);
- printk(KERN_ERR "serial_2002: file open error = %d\n", result);
+ dev_err(dev->class_dev, "file open error = %d\n", result);
} else {
struct config_t {

--
1.7.9.5