LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] Coding style in serial2002
@ 2011-01-20 7:50 ahern.michael.t
2011-01-20 7:53 ` Felipe Balbi
2011-01-20 7:56 ` Uwe Kleine-König
0 siblings, 2 replies; 5+ messages in thread
From: ahern.michael.t @ 2011-01-20 7:50 UTC (permalink / raw)
To: gregkh, u.kleine-koenig, julia, nikai, morgan.gatti
Cc: devel, linux-kernel, Michael Ahern
From: Michael Ahern <ahern.michael.t@gmail.com>
This patch resolves braces and KERN_ warnings by checkpatch.pl
Warnings: printk() should include KERN_ facility level, removed unnecessary braces, lines over 80 chars
Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com>
---
drivers/staging/comedi/drivers/serial2002.c | 172 ++++++++++++---------------
1 files changed, 76 insertions(+), 96 deletions(-)
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 6949086..eee14dd 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -246,7 +246,12 @@ static void tty_setspeed(struct file *f, int speed)
struct termios settings;
tty_ioctl(f, TCGETS, (unsigned long)&settings);
-/* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX)); */
+
+ /* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
+ * better
+ * pr_info("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
+ */
+
settings.c_iflag = 0;
settings.c_oflag = 0;
settings.c_lflag = 0;
@@ -254,41 +259,36 @@ static void tty_setspeed(struct file *f, int speed)
settings.c_cc[VMIN] = 0;
settings.c_cc[VTIME] = 0;
switch (speed) {
- case 2400:{
- settings.c_cflag |= B2400;
- }
+ case 2400:
+ settings.c_cflag |= B2400;
break;
- case 4800:{
- settings.c_cflag |= B4800;
- }
+ case 4800:
+ settings.c_cflag |= B4800;
break;
- case 9600:{
- settings.c_cflag |= B9600;
- }
+ case 9600:
+ settings.c_cflag |= B9600;
break;
- case 19200:{
- settings.c_cflag |= B19200;
- }
+ case 19200:
+ settings.c_cflag |= B19200;
break;
- case 38400:{
- settings.c_cflag |= B38400;
- }
+ case 38400:
+ settings.c_cflag |= B38400;
break;
- case 57600:{
- settings.c_cflag |= B57600;
- }
+ case 57600:
+ settings.c_cflag |= B57600;
break;
- case 115200:{
- settings.c_cflag |= B115200;
- }
+ case 115200:
+ settings.c_cflag |= B115200;
break;
- default:{
- settings.c_cflag |= B9600;
- }
+ default:
+ settings.c_cflag |= B9600;
break;
}
tty_ioctl(f, TCSETS, (unsigned long)&settings);
-/* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX)); */
+/* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
+ * better
+ * pr_info("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
+ */
}
{
/* Set low latency */
@@ -332,22 +332,20 @@ 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);
} else {
if (length == 1) {
switch ((data >> 5) & 0x03) {
- case 0:{
- result.value = 0;
- result.kind = is_digital;
- }
+ case 0:
+ result.value = 0;
+ result.kind = is_digital;
break;
- case 1:{
- result.value = 1;
- result.kind = is_digital;
- }
+ case 1:
+ result.value = 1;
+ result.kind = is_digital;
break;
}
} else {
@@ -405,7 +403,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);
+ pr_err("serial_2002: file open error = %d\n", result);
} else {
struct config_t {
@@ -453,38 +451,32 @@ static int serial_2002_open(struct comedi_device *dev)
kind = (data.value >> 5) & 0x7;
command = (data.value >> 8) & 0x3;
switch (kind) {
- case 1:{
+ case 1:
cur_config = dig_in_config;
- }
break;
- case 2:{
+ case 2:
cur_config = dig_out_config;
- }
break;
- case 3:{
+ case 3:
cur_config = chan_in_config;
- }
break;
- case 4:{
+ case 4:
cur_config = chan_out_config;
- }
break;
- case 5:{
+ case 5:
cur_config = chan_in_config;
- }
break;
}
if (cur_config) {
cur_config[channel].kind = kind;
switch (command) {
- case 0:{
+ case 0:
cur_config[channel].bits
= (data.value >> 10) &
0x3f;
- }
break;
- case 1:{
+ case 1: {
int unit, sign, min;
unit = (data.value >> 10) &
0x7;
@@ -494,17 +486,14 @@ static int serial_2002_open(struct comedi_device *dev)
0xfffff;
switch (unit) {
- case 0:{
+ case 0:
min = min * 1000000;
- }
break;
- case 1:{
+ case 1:
min = min * 1000;
- }
break;
- case 2:{
+ case 2:
min = min * 1;
- }
break;
}
@@ -514,7 +503,7 @@ static int serial_2002_open(struct comedi_device *dev)
cur_config[channel].min = min;
}
break;
- case 2:{
+ case 2: {
int unit, sign, max;
unit = (data.value >> 10) &
0x7;
@@ -524,17 +513,14 @@ static int serial_2002_open(struct comedi_device *dev)
0xfffff;
switch (unit) {
- case 0:{
+ case 0:
max = max * 1000000;
- }
break;
- case 1:{
+ case 1:
max = max * 1000;
- }
break;
- case 2:{
+ case 2:
max = max * 1;
- }
break;
}
@@ -556,42 +542,36 @@ static int serial_2002_open(struct comedi_device *dev)
int kind = 0;
switch (i) {
- case 0:{
- c = dig_in_config;
- mapping = devpriv->digital_in_mapping;
- kind = 1;
- }
+ case 0:
+ c = dig_in_config;
+ mapping = devpriv->digital_in_mapping;
+ kind = 1;
break;
- case 1:{
- c = dig_out_config;
- mapping = devpriv->digital_out_mapping;
- kind = 2;
- }
+ case 1:
+ c = dig_out_config;
+ mapping = devpriv->digital_out_mapping;
+ kind = 2;
break;
- case 2:{
- c = chan_in_config;
- mapping = devpriv->analog_in_mapping;
- range = devpriv->in_range;
- kind = 3;
- }
+ case 2:
+ c = chan_in_config;
+ mapping = devpriv->analog_in_mapping;
+ range = devpriv->in_range;
+ kind = 3;
break;
- case 3:{
- c = chan_out_config;
- mapping = devpriv->analog_out_mapping;
- range = devpriv->out_range;
- kind = 4;
- }
+ case 3:
+ c = chan_out_config;
+ mapping = devpriv->analog_out_mapping;
+ range = devpriv->out_range;
+ kind = 4;
break;
- case 4:{
- c = chan_in_config;
- mapping = devpriv->encoder_in_mapping;
- range = devpriv->in_range;
- kind = 5;
- }
+ case 4:
+ c = chan_in_config;
+ mapping = devpriv->encoder_in_mapping;
+ range = devpriv->in_range;
+ kind = 5;
break;
- default:{
- c = NULL;
- }
+ default:
+ c = NULL;
break;
}
if (c) {
@@ -816,7 +796,7 @@ static int serial2002_attach(struct comedi_device *dev,
{
struct comedi_subdevice *s;
- printk(KERN_INFO "comedi%d: serial2002: ", dev->minor);
+ pr_info("comedi%d: serial2002: ", dev->minor);
dev->board_name = thisboard->name;
if (alloc_private(dev, sizeof(struct serial2002_private)) < 0)
return -ENOMEM;
@@ -825,7 +805,7 @@ static int serial2002_attach(struct comedi_device *dev,
dev->close = serial_2002_close;
devpriv->port = it->options[0];
devpriv->speed = it->options[1];
- printk(KERN_INFO "/dev/ttyS%d @ %d\n", devpriv->port, devpriv->speed);
+ pr_info("/dev/ttyS%d @ %d\n", devpriv->port, devpriv->speed);
if (alloc_subdevices(dev, 5) < 0)
return -ENOMEM;
@@ -884,7 +864,7 @@ static int serial2002_detach(struct comedi_device *dev)
struct comedi_subdevice *s;
int i;
- printk(KERN_ERR "comedi%d: serial2002: remove\n", dev->minor);
+ pr_err("comedi%d: serial2002: remove\n", dev->minor);
for (i = 0; i < 5; i++) {
s = &dev->subdevices[i];
if (s->maxdata_list)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Coding style in serial2002
2011-01-20 7:50 [PATCH] Coding style in serial2002 ahern.michael.t
@ 2011-01-20 7:53 ` Felipe Balbi
2011-01-20 7:56 ` Uwe Kleine-König
1 sibling, 0 replies; 5+ messages in thread
From: Felipe Balbi @ 2011-01-20 7:53 UTC (permalink / raw)
To: ahern.michael.t
Cc: gregkh, u.kleine-koenig, julia, nikai, morgan.gatti, devel, linux-kernel
On Thu, Jan 20, 2011 at 06:50:02PM +1100, ahern.michael.t@gmail.com wrote:
> From: Michael Ahern <ahern.michael.t@gmail.com>
>
> This patch resolves braces and KERN_ warnings by checkpatch.pl
> Warnings: printk() should include KERN_ facility level, removed unnecessary braces, lines over 80 chars
break the commit log in 72 chars
> @@ -246,7 +246,12 @@ static void tty_setspeed(struct file *f, int speed)
> struct termios settings;
>
> tty_ioctl(f, TCGETS, (unsigned long)&settings);
> -/* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX)); */
> +
> + /* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
> + * better
> + * pr_info("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
> + */
since you're fixing coding style, you might as well use the correct
multi-line comment style:
/*
* printk(....
* better
* pr_info(....
*/
--
balbi
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Coding style in serial2002
2011-01-20 7:50 [PATCH] Coding style in serial2002 ahern.michael.t
2011-01-20 7:53 ` Felipe Balbi
@ 2011-01-20 7:56 ` Uwe Kleine-König
1 sibling, 0 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2011-01-20 7:56 UTC (permalink / raw)
To: ahern.michael.t; +Cc: gregkh, julia, nikai, morgan.gatti, devel, linux-kernel
Hello Michael,
On Thu, Jan 20, 2011 at 06:50:02PM +1100, ahern.michael.t@gmail.com wrote:
> From: Michael Ahern <ahern.michael.t@gmail.com>
>
> This patch resolves braces and KERN_ warnings by checkpatch.pl
> Warnings: printk() should include KERN_ facility level, removed unnecessary braces, lines over 80 chars
>
> Signed-off-by: Michael Ahern <ahern.michael.t@gmail.com>
> ---
> drivers/staging/comedi/drivers/serial2002.c | 172 ++++++++++++---------------
> 1 files changed, 76 insertions(+), 96 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
> index 6949086..eee14dd 100644
> --- a/drivers/staging/comedi/drivers/serial2002.c
> +++ b/drivers/staging/comedi/drivers/serial2002.c
> @@ -246,7 +246,12 @@ static void tty_setspeed(struct file *f, int speed)
> struct termios settings;
>
> tty_ioctl(f, TCGETS, (unsigned long)&settings);
> -/* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX)); */
> +
> + /* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
> + * better
> + * pr_info("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
> + */
> +
can you just delete these commented out printks?
> settings.c_iflag = 0;
> settings.c_oflag = 0;
> settings.c_lflag = 0;
> @@ -254,41 +259,36 @@ static void tty_setspeed(struct file *f, int speed)
> settings.c_cc[VMIN] = 0;
> settings.c_cc[VTIME] = 0;
> switch (speed) {
> - case 2400:{
> - settings.c_cflag |= B2400;
> - }
> + case 2400:
> + settings.c_cflag |= B2400;
> break;
> - case 4800:{
> - settings.c_cflag |= B4800;
> - }
> + case 4800:
> + settings.c_cflag |= B4800;
> break;
> - case 9600:{
> - settings.c_cflag |= B9600;
> - }
> + case 9600:
> + settings.c_cflag |= B9600;
> break;
> - case 19200:{
> - settings.c_cflag |= B19200;
> - }
> + case 19200:
> + settings.c_cflag |= B19200;
> break;
> - case 38400:{
> - settings.c_cflag |= B38400;
> - }
> + case 38400:
> + settings.c_cflag |= B38400;
> break;
> - case 57600:{
> - settings.c_cflag |= B57600;
> - }
> + case 57600:
> + settings.c_cflag |= B57600;
> break;
> - case 115200:{
> - settings.c_cflag |= B115200;
> - }
> + case 115200:
> + settings.c_cflag |= B115200;
> break;
> - default:{
> - settings.c_cflag |= B9600;
> - }
> + default:
> + settings.c_cflag |= B9600;
> break;
> }
> tty_ioctl(f, TCSETS, (unsigned long)&settings);
> -/* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX)); */
> +/* printk("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
> + * better
> + * pr_info("Speed: %d\n", settings.c_cflag & (CBAUD | CBAUDEX));
> + */
> }
> {
> /* Set low latency */
> @@ -332,22 +332,20 @@ 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");
Maybe do #define pr_fmt(fmt) "serial2002: " fmt and remove all explicit
occurences of serial2002?
> break;
> } else if (data & 0x80) {
> result.value = (result.value << 7) | (data & 0x7f);
> } else {
> if (length == 1) {
> switch ((data >> 5) & 0x03) {
> - case 0:{
> - result.value = 0;
> - result.kind = is_digital;
> - }
> + case 0:
> + result.value = 0;
> + result.kind = is_digital;
> break;
> - case 1:{
> - result.value = 1;
> - result.kind = is_digital;
> - }
> + case 1:
> + result.value = 1;
> + result.kind = is_digital;
> break;
> }
> } else {
> @@ -405,7 +403,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);
> + pr_err("serial_2002: file open error = %d\n", result);
> } else {
> struct config_t {
>
> @@ -453,38 +451,32 @@ static int serial_2002_open(struct comedi_device *dev)
> kind = (data.value >> 5) & 0x7;
> command = (data.value >> 8) & 0x3;
> switch (kind) {
> - case 1:{
> + case 1:
> cur_config = dig_in_config;
> - }
> break;
> - case 2:{
> + case 2:
> cur_config = dig_out_config;
> - }
> break;
> - case 3:{
> + case 3:
> cur_config = chan_in_config;
> - }
> break;
> - case 4:{
> + case 4:
> cur_config = chan_out_config;
> - }
> break;
> - case 5:{
> + case 5:
> cur_config = chan_in_config;
> - }
> break;
> }
>
> if (cur_config) {
> cur_config[channel].kind = kind;
> switch (command) {
> - case 0:{
> + case 0:
> cur_config[channel].bits
> = (data.value >> 10) &
> 0x3f;
> - }
> break;
> - case 1:{
> + case 1: {
> int unit, sign, min;
> unit = (data.value >> 10) &
> 0x7;
> @@ -494,17 +486,14 @@ static int serial_2002_open(struct comedi_device *dev)
> 0xfffff;
>
> switch (unit) {
> - case 0:{
> + case 0:
> min = min * 1000000;
> - }
> break;
> - case 1:{
> + case 1:
> min = min * 1000;
> - }
> break;
> - case 2:{
> + case 2:
> min = min * 1;
> - }
> break;
> }
>
> @@ -514,7 +503,7 @@ static int serial_2002_open(struct comedi_device *dev)
> cur_config[channel].min = min;
> }
> break;
> - case 2:{
> + case 2: {
> int unit, sign, max;
> unit = (data.value >> 10) &
> 0x7;
> @@ -524,17 +513,14 @@ static int serial_2002_open(struct comedi_device *dev)
> 0xfffff;
>
> switch (unit) {
> - case 0:{
> + case 0:
> max = max * 1000000;
> - }
> break;
> - case 1:{
> + case 1:
> max = max * 1000;
> - }
> break;
> - case 2:{
> + case 2:
> max = max * 1;
> - }
> break;
> }
>
> @@ -556,42 +542,36 @@ static int serial_2002_open(struct comedi_device *dev)
> int kind = 0;
>
> switch (i) {
> - case 0:{
> - c = dig_in_config;
> - mapping = devpriv->digital_in_mapping;
> - kind = 1;
> - }
> + case 0:
> + c = dig_in_config;
> + mapping = devpriv->digital_in_mapping;
> + kind = 1;
> break;
> - case 1:{
> - c = dig_out_config;
> - mapping = devpriv->digital_out_mapping;
> - kind = 2;
> - }
> + case 1:
> + c = dig_out_config;
> + mapping = devpriv->digital_out_mapping;
> + kind = 2;
> break;
> - case 2:{
> - c = chan_in_config;
> - mapping = devpriv->analog_in_mapping;
> - range = devpriv->in_range;
> - kind = 3;
> - }
> + case 2:
> + c = chan_in_config;
> + mapping = devpriv->analog_in_mapping;
> + range = devpriv->in_range;
> + kind = 3;
> break;
> - case 3:{
> - c = chan_out_config;
> - mapping = devpriv->analog_out_mapping;
> - range = devpriv->out_range;
> - kind = 4;
> - }
> + case 3:
> + c = chan_out_config;
> + mapping = devpriv->analog_out_mapping;
> + range = devpriv->out_range;
> + kind = 4;
> break;
> - case 4:{
> - c = chan_in_config;
> - mapping = devpriv->encoder_in_mapping;
> - range = devpriv->in_range;
> - kind = 5;
> - }
> + case 4:
> + c = chan_in_config;
> + mapping = devpriv->encoder_in_mapping;
> + range = devpriv->in_range;
> + kind = 5;
> break;
> - default:{
> - c = NULL;
> - }
> + default:
> + c = NULL;
> break;
> }
> if (c) {
> @@ -816,7 +796,7 @@ static int serial2002_attach(struct comedi_device *dev,
> {
> struct comedi_subdevice *s;
>
> - printk(KERN_INFO "comedi%d: serial2002: ", dev->minor);
> + pr_info("comedi%d: serial2002: ", dev->minor);
> dev->board_name = thisboard->name;
> if (alloc_private(dev, sizeof(struct serial2002_private)) < 0)
> return -ENOMEM;
> @@ -825,7 +805,7 @@ static int serial2002_attach(struct comedi_device *dev,
> dev->close = serial_2002_close;
> devpriv->port = it->options[0];
> devpriv->speed = it->options[1];
> - printk(KERN_INFO "/dev/ttyS%d @ %d\n", devpriv->port, devpriv->speed);
> + pr_info("/dev/ttyS%d @ %d\n", devpriv->port, devpriv->speed);
>
> if (alloc_subdevices(dev, 5) < 0)
> return -ENOMEM;
> @@ -884,7 +864,7 @@ static int serial2002_detach(struct comedi_device *dev)
> struct comedi_subdevice *s;
> int i;
>
> - printk(KERN_ERR "comedi%d: serial2002: remove\n", dev->minor);
> + pr_err("comedi%d: serial2002: remove\n", dev->minor);
dev_err(dev, "...");
I wonder why this is an error though.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Coding style in serial2002
2011-01-14 1:14 ahern.michael.t
@ 2011-01-14 7:47 ` Uwe Kleine-König
0 siblings, 0 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2011-01-14 7:47 UTC (permalink / raw)
To: ahern.michael.t; +Cc: gregkh, julia, nikai, morgan.gatti, devel, linux-kernel
Hello,
On Fri, Jan 14, 2011 at 12:14:54PM +1100, ahern.michael.t@gmail.com wrote:
> @@ -329,7 +332,7 @@ static struct serial_data serial_read(struct file *f, int timeout)
>
> length++;
> if (data < 0) {
> - printk("serial2002 error\n");
> + printk(KERN_ERR "serial2002 error\n");
better use pr_err
> break;
> } else if (data & 0x80) {
> result.value = (result.value << 7) | (data & 0x7f);
> @@ -402,7 +405,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("serial_2002: file open error = %d\n", result);
> + printk(KERN_ERR "serial_2002: file open error = %d\n", result);
> } else {
> struct config_t {
>
> @@ -434,7 +437,7 @@ static int serial_2002_open(struct comedi_device *dev)
> }
>
> tty_setspeed(devpriv->tty, devpriv->speed);
> - poll_channel(devpriv->tty, 31); /* Start reading configuration */
> + poll_channel(devpriv->tty, 31); /* Start reading config */
> while (1) {
> struct serial_data data;
>
> @@ -451,23 +454,23 @@ static int serial_2002_open(struct comedi_device *dev)
> command = (data.value >> 8) & 0x3;
> switch (kind) {
> case 1:{
IMHO these braces can go away, too.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Coding style in serial2002
@ 2011-01-14 1:14 ahern.michael.t
2011-01-14 7:47 ` Uwe Kleine-König
0 siblings, 1 reply; 5+ messages in thread
From: ahern.michael.t @ 2011-01-14 1:14 UTC (permalink / raw)
To: gregkh, u.kleine-koenig, julia, nikai, morgan.gatti
Cc: devel, linux-kernel, Michael Ahern
From: Michael Ahern <ahern.michael.t@gmail.com>
Patch that resolves braces and KERN_ warnings by checkpatch.pl
Warnings: printk() should include KERN_ facility level, braces not needed, lines over 80 characters.
Signed-off-by: Michael Ahern
---
drivers/staging/comedi/drivers/serial2002.c | 206 ++++++++++++---------------
1 files changed, 93 insertions(+), 113 deletions(-)
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index c9be9e0..6949086 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -192,9 +192,10 @@ static int tty_read(struct file *f, int timeout)
elapsed =
(1000000 * (now.tv_sec - start.tv_sec) +
now.tv_usec - start.tv_usec);
- if (elapsed > timeout) {
+
+ if (elapsed > timeout)
break;
- }
+
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(((timeout -
elapsed) * HZ) / 10000);
@@ -204,9 +205,10 @@ static int tty_read(struct file *f, int timeout)
unsigned char ch;
f->f_pos = 0;
- if (f->f_op->read(f, &ch, 1, &f->f_pos) == 1) {
+
+ if (f->f_op->read(f, &ch, 1, &f->f_pos) == 1)
result = ch;
- }
+
}
} else {
/* Device does not support poll, busy wait */
@@ -215,9 +217,10 @@ static int tty_read(struct file *f, int timeout)
unsigned char ch;
retries++;
- if (retries >= timeout) {
+
+ if (retries >= timeout)
break;
- }
+
f->f_pos = 0;
if (f->f_op->read(f, &ch, 1, &f->f_pos) == 1) {
@@ -329,7 +332,7 @@ static struct serial_data serial_read(struct file *f, int timeout)
length++;
if (data < 0) {
- printk("serial2002 error\n");
+ printk(KERN_ERR "serial2002 error\n");
break;
} else if (data & 0x80) {
result.value = (result.value << 7) | (data & 0x7f);
@@ -402,7 +405,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("serial_2002: file open error = %d\n", result);
+ printk(KERN_ERR "serial_2002: file open error = %d\n", result);
} else {
struct config_t {
@@ -434,7 +437,7 @@ static int serial_2002_open(struct comedi_device *dev)
}
tty_setspeed(devpriv->tty, devpriv->speed);
- poll_channel(devpriv->tty, 31); /* Start reading configuration */
+ poll_channel(devpriv->tty, 31); /* Start reading config */
while (1) {
struct serial_data data;
@@ -451,23 +454,23 @@ static int serial_2002_open(struct comedi_device *dev)
command = (data.value >> 8) & 0x3;
switch (kind) {
case 1:{
- cur_config = dig_in_config;
+ cur_config = dig_in_config;
}
break;
case 2:{
- cur_config = dig_out_config;
+ cur_config = dig_out_config;
}
break;
case 3:{
- cur_config = chan_in_config;
+ cur_config = chan_in_config;
}
break;
case 4:{
- cur_config = chan_out_config;
+ cur_config = chan_out_config;
}
break;
case 5:{
- cur_config = chan_in_config;
+ cur_config = chan_in_config;
}
break;
}
@@ -476,92 +479,69 @@ static int serial_2002_open(struct comedi_device *dev)
cur_config[channel].kind = kind;
switch (command) {
case 0:{
- cur_config[channel].bits
- =
- (data.value >> 10) &
- 0x3f;
+ cur_config[channel].bits
+ = (data.value >> 10) &
+ 0x3f;
}
break;
case 1:{
- int unit, sign, min;
- unit =
- (data.value >> 10) &
- 0x7;
- sign =
- (data.value >> 13) &
- 0x1;
- min =
- (data.value >> 14) &
- 0xfffff;
-
- switch (unit) {
- case 0:{
- min =
- min
- *
- 1000000;
- }
- break;
- case 1:{
- min =
- min
- *
- 1000;
- }
- break;
- case 2:{
- min =
- min
- * 1;
- }
- break;
+ int unit, sign, min;
+ unit = (data.value >> 10) &
+ 0x7;
+ sign = (data.value >> 13) &
+ 0x1;
+ min = (data.value >> 14) &
+ 0xfffff;
+
+ switch (unit) {
+ case 0:{
+ min = min * 1000000;
}
- if (sign) {
- min = -min;
+ break;
+ case 1:{
+ min = min * 1000;
}
- cur_config[channel].min
- = min;
+ break;
+ case 2:{
+ min = min * 1;
+ }
+ break;
+ }
+
+ if (sign)
+ min = -min;
+
+ cur_config[channel].min = min;
}
break;
case 2:{
- int unit, sign, max;
- unit =
- (data.value >> 10) &
- 0x7;
- sign =
- (data.value >> 13) &
- 0x1;
- max =
- (data.value >> 14) &
- 0xfffff;
-
- switch (unit) {
- case 0:{
- max =
- max
- *
- 1000000;
- }
- break;
- case 1:{
- max =
- max
- *
- 1000;
- }
- break;
- case 2:{
- max =
- max
- * 1;
- }
- break;
+ int unit, sign, max;
+ unit = (data.value >> 10) &
+ 0x7;
+ sign = (data.value >> 13) &
+ 0x1;
+ max = (data.value >> 14) &
+ 0xfffff;
+
+ switch (unit) {
+ case 0:{
+ max = max * 1000000;
+ }
+ break;
+ case 1:{
+ max = max * 1000;
}
- if (sign) {
- max = -max;
+ break;
+ case 2:{
+ max = max * 1;
}
- cur_config[channel].max
- = max;
+ break;
+ }
+
+ if (sign)
+ max = -max;
+
+ cur_config[channel].max = max;
}
break;
}
@@ -622,9 +602,9 @@ static int serial_2002_open(struct comedi_device *dev)
int j, chan;
for (chan = 0, j = 0; j < 32; j++) {
- if (c[j].kind == kind) {
+ if (c[j].kind == kind)
chan++;
- }
+
}
s = &dev->subdevices[i];
s->n_chan = chan;
@@ -649,9 +629,9 @@ static int serial_2002_open(struct comedi_device *dev)
}
for (chan = 0, j = 0; j < 32; j++) {
if (c[j].kind == kind) {
- if (mapping) {
+ if (mapping)
mapping[chan] = j;
- }
+
if (range) {
range[j].length = 1;
range[j].range.min =
@@ -704,9 +684,9 @@ err_alloc_configs:
static void serial_2002_close(struct comedi_device *dev)
{
- if (!IS_ERR(devpriv->tty) && (devpriv->tty != 0)) {
+ if (!IS_ERR(devpriv->tty) && (devpriv->tty != 0))
filp_close(devpriv->tty, 0);
- }
+
}
static int serial2002_di_rinsn(struct comedi_device *dev,
@@ -723,9 +703,9 @@ static int serial2002_di_rinsn(struct comedi_device *dev,
poll_digital(devpriv->tty, chan);
while (1) {
read = serial_read(devpriv->tty, 1000);
- if (read.kind != is_digital || read.index == chan) {
+ if (read.kind != is_digital || read.index == chan)
break;
- }
+
}
data[n] = read.value;
}
@@ -765,9 +745,9 @@ static int serial2002_ai_rinsn(struct comedi_device *dev,
poll_channel(devpriv->tty, chan);
while (1) {
read = serial_read(devpriv->tty, 1000);
- if (read.kind != is_channel || read.index == chan) {
+ if (read.kind != is_channel || read.index == chan)
break;
- }
+
}
data[n] = read.value;
}
@@ -801,9 +781,9 @@ static int serial2002_ao_rinsn(struct comedi_device *dev,
int n;
int chan = CR_CHAN(insn->chanspec);
- for (n = 0; n < insn->n; n++) {
+ for (n = 0; n < insn->n; n++)
data[n] = devpriv->ao_readback[chan];
- }
+
return n;
}
@@ -822,9 +802,9 @@ static int serial2002_ei_rinsn(struct comedi_device *dev,
poll_channel(devpriv->tty, chan);
while (1) {
read = serial_read(devpriv->tty, 1000);
- if (read.kind != is_channel || read.index == chan) {
+ if (read.kind != is_channel || read.index == chan)
break;
- }
+
}
data[n] = read.value;
}
@@ -836,16 +816,16 @@ static int serial2002_attach(struct comedi_device *dev,
{
struct comedi_subdevice *s;
- printk("comedi%d: serial2002: ", dev->minor);
+ printk(KERN_INFO "comedi%d: serial2002: ", dev->minor);
dev->board_name = thisboard->name;
- if (alloc_private(dev, sizeof(struct serial2002_private)) < 0) {
+ if (alloc_private(dev, sizeof(struct serial2002_private)) < 0)
return -ENOMEM;
- }
+
dev->open = serial_2002_open;
dev->close = serial_2002_close;
devpriv->port = it->options[0];
devpriv->speed = it->options[1];
- printk("/dev/ttyS%d @ %d\n", devpriv->port, devpriv->speed);
+ printk(KERN_INFO "/dev/ttyS%d @ %d\n", devpriv->port, devpriv->speed);
if (alloc_subdevices(dev, 5) < 0)
return -ENOMEM;
@@ -904,15 +884,15 @@ static int serial2002_detach(struct comedi_device *dev)
struct comedi_subdevice *s;
int i;
- printk("comedi%d: serial2002: remove\n", dev->minor);
+ printk(KERN_ERR "comedi%d: serial2002: remove\n", dev->minor);
for (i = 0; i < 5; i++) {
s = &dev->subdevices[i];
- if (s->maxdata_list) {
+ if (s->maxdata_list)
kfree(s->maxdata_list);
- }
- if (s->range_table_list) {
+
+ if (s->range_table_list)
kfree(s->range_table_list);
- }
+
}
return 0;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-20 7:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-20 7:50 [PATCH] Coding style in serial2002 ahern.michael.t
2011-01-20 7:53 ` Felipe Balbi
2011-01-20 7:56 ` Uwe Kleine-König
-- strict thread matches above, loose matches on Subject: below --
2011-01-14 1:14 ahern.michael.t
2011-01-14 7:47 ` Uwe Kleine-König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).