* [PATCH 01/25] Staging: comedi: fix printk issue in usbduxfast.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 02/25] Staging: comedi: fix printk issues " Ravishankar Karkala Mallikarjunayya
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the usbduxfast.c file that fixes up a printk found
by the checkpatch.pl tool.
i.e. WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ...
WARNING: Prefer pr_err(... to printk(KERN_ERR, ...and
WARNING: quoted string split across lines.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbduxfast.c | 34 ++++++++++++---------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index c672ea3..09d2d9f 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -216,19 +216,19 @@ static int send_dux_commands(struct usbduxfastsub_s *udfs, int cmd_type)
udfs->dux_commands[0] = cmd_type;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: dux_commands: ",
- udfs->comedidev->minor);
+ pr_debug("comedi%d: usbduxfast: dux_commands: ",
+ udfs->comedidev->minor);
for (tmp = 0; tmp < SIZEOFDUXBUFFER; tmp++)
- printk(" %02x", udfs->dux_commands[tmp]);
- printk("\n");
+ pr_cont(" %02x", udfs->dux_commands[tmp]);
+ pr_cont("\n");
#endif
tmp = usb_bulk_msg(udfs->usbdev,
usb_sndbulkpipe(udfs->usbdev, CHANNELLISTEP),
udfs->dux_commands, SIZEOFDUXBUFFER, &nsent, 10000);
if (tmp < 0)
- printk(KERN_ERR "comedi%d: could not transmit dux_commands to"
- "the usb-device, err=%d\n", udfs->comedidev->minor, tmp);
+ pr_err("comedi%d: could not transmit dux_commands to the usb-device, err=%d\n",
+ udfs->comedidev->minor, tmp);
return tmp;
}
@@ -248,7 +248,7 @@ static int usbduxfastsub_unlink_InURBs(struct usbduxfastsub_s *udfs)
j = 0;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi: usbduxfast: unlinked InURB: res=%d\n", j);
+ pr_debug("comedi: usbduxfast: unlinked InURB: res=%d\n", j);
#endif
return err;
}
@@ -263,11 +263,11 @@ static int usbduxfast_ai_stop(struct usbduxfastsub_s *udfs, int do_unlink)
int ret = 0;
if (!udfs) {
- printk(KERN_ERR "comedi?: usbduxfast_ai_stop: udfs=NULL!\n");
+ pr_err("comedi?: usbduxfast_ai_stop: udfs=NULL!\n");
return -EFAULT;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi: usbduxfast_ai_stop\n");
+ pr_debug("comedi: usbduxfast_ai_stop\n");
#endif
udfs->ai_cmd_running = 0;
@@ -324,22 +324,19 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
/* sanity checks - is the urb there? */
if (!urb) {
- printk(KERN_ERR "comedi_: usbduxfast_: ao int-handler called "
- "with urb=NULL!\n");
+ pr_err("comedi_: usbduxfast_: ao int-handler called with urb=NULL!\n");
return;
}
/* the context variable points to the subdevice */
this_comedidev = urb->context;
if (!this_comedidev) {
- printk(KERN_ERR "comedi_: usbduxfast_: urb context is a NULL "
- "pointer!\n");
+ pr_err("comedi_: usbduxfast_: urb context is a NULL pointer!\n");
return;
}
/* the private structure of the subdevice is usbduxfastsub_s */
udfs = this_comedidev->private;
if (!udfs) {
- printk(KERN_ERR "comedi_: usbduxfast_: private of comedi "
- "subdev is a NULL pointer!\n");
+ pr_err("comedi_: usbduxfast_: private of comedi subdev is a NULL pointer!\n");
return;
}
/* are we running a command? */
@@ -438,7 +435,7 @@ static void usbduxfastsub_ai_Irq(struct urb *urb)
urb->status = 0;
err = usb_submit_urb(urb, GFP_ATOMIC);
if (err < 0) {
- printk(KERN_ERR "comedi%d: usbduxfast: urb resubm failed: %d",
+ pr_err("comedi%d: usbduxfast: urb resubm failed: %d\n",
udfs->comedidev->minor, err);
s->async->events |= COMEDI_CB_EOA;
s->async->events |= COMEDI_CB_ERROR;
@@ -465,7 +462,7 @@ static int usbduxfastsub_start(struct usbduxfastsub_s *udfs)
1, /* Length */
EZTIMEOUT); /* Timeout */
if (ret < 0) {
- printk("comedi_: usbduxfast_: control msg failed (start)\n");
+ pr_err("comedi_: usbduxfast_: control msg failed (start)\n");
return ret;
}
@@ -488,8 +485,7 @@ static int usbduxfastsub_stop(struct usbduxfastsub_s *udfs)
local_transfer_buffer, 1, /* Length */
EZTIMEOUT); /* Timeout */
if (ret < 0) {
- printk(KERN_ERR "comedi_: usbduxfast: control msg failed "
- "(stop)\n");
+ pr_err("comedi_: usbduxfast: control msg failed (stop)\n");
return ret;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 02/25] Staging: comedi: fix printk issues in usbduxfast.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 01/25] Staging: comedi: fix printk issue in usbduxfast.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 03/25] Staging: comedi: fix printk issue " Ravishankar Karkala Mallikarjunayya
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the usbduxfast.c file that fixes up a printk found
by checkpatch.pl tool.
i.e. WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ...
WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
WARNING: quoted string split across lines.
WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbduxfast.c | 47 ++++++++++++---------------
1 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 09d2d9f..32e3f65 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -539,14 +539,14 @@ static int usbduxfastsub_submit_InURBs(struct usbduxfastsub_s *udfs)
SIZEINBUF, usbduxfastsub_ai_Irq, udfs->comedidev);
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: submitting in-urb: "
- "0x%p,0x%p\n", udfs->comedidev->minor, udfs->urbIn->context,
- udfs->urbIn->dev);
+ pr_debug("comedi%d: usbduxfast: submitting in-urb: 0x%p,0x%p\n",
+ udfs->comedidev->minor, udfs->urbIn->context,
+ udfs->urbIn->dev);
#endif
ret = usb_submit_urb(udfs->urbIn, GFP_ATOMIC);
if (ret) {
- printk(KERN_ERR "comedi_: usbduxfast: ai: usb_submit_urb error"
- " %d\n", ret);
+ pr_err("comedi_: usbduxfast: ai: usb_submit_urb error %d\n",
+ ret);
return ret;
}
return 0;
@@ -1476,13 +1476,11 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
int ret;
if (udev->speed != USB_SPEED_HIGH) {
- printk(KERN_ERR "comedi_: usbduxfast_: This driver needs"
- "USB 2.0 to operate. Aborting...\n");
+ pr_err("comedi_: usbduxfast_: This driver needs USB 2.0 to operate. Aborting...\n");
return -ENODEV;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi_: usbduxfast_: finding a free structure for "
- "the usb-device\n");
+ pr_debug("comedi_: usbduxfast_: finding a free structure for the usb-device\n");
#endif
down(&start_stop_sem);
/* look for a free place in the usbduxfast array */
@@ -1496,13 +1494,13 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
/* no more space */
if (index == -1) {
- printk(KERN_ERR "Too many usbduxfast-devices connected.\n");
+ pr_err("Too many usbduxfast-devices connected.\n");
up(&start_stop_sem);
return -EMFILE;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi_: usbduxfast: usbduxfastsub[%d] is ready to "
- "connect to comedi.\n", index);
+ pr_debug("comedi_: usbduxfast: usbduxfastsub[%d] is ready to connect to comedi.\n",
+ index);
#endif
sema_init(&(usbduxfastsub[index].sem), 1);
@@ -1520,15 +1518,14 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
usb_set_intfdata(uinterf, &(usbduxfastsub[index]));
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi_: usbduxfast: ifnum=%d\n",
- usbduxfastsub[index].ifnum);
+ pr_debug("comedi_: usbduxfast: ifnum=%d\n",
+ usbduxfastsub[index].ifnum);
#endif
/* create space for the commands going to the usb device */
usbduxfastsub[index].dux_commands = kmalloc(SIZEOFDUXBUFFER,
GFP_KERNEL);
if (!usbduxfastsub[index].dux_commands) {
- printk(KERN_ERR "comedi_: usbduxfast: error alloc space for "
- "dac commands\n");
+ pr_err("comedi_: usbduxfast: error alloc space for dac commands\n");
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -1536,8 +1533,7 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
/* create space of the instruction buffer */
usbduxfastsub[index].insnBuffer = kmalloc(SIZEINSNBUF, GFP_KERNEL);
if (!usbduxfastsub[index].insnBuffer) {
- printk(KERN_ERR "comedi_: usbduxfast: could not alloc space "
- "for insnBuffer\n");
+ pr_err("comedi_: usbduxfast: could not alloc space for insnBuffer\n");
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -1546,24 +1542,23 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
i = usb_set_interface(usbduxfastsub[index].usbdev,
usbduxfastsub[index].ifnum, 1);
if (i < 0) {
- printk(KERN_ERR "comedi_: usbduxfast%d: could not switch to "
- "alternate setting 1.\n", index);
+ pr_err("comedi_: usbduxfast%d: could not switch to alternate setting 1.\n",
+ index);
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENODEV;
}
usbduxfastsub[index].urbIn = usb_alloc_urb(0, GFP_KERNEL);
if (!usbduxfastsub[index].urbIn) {
- printk(KERN_ERR "comedi_: usbduxfast%d: Could not alloc."
- "urb\n", index);
+ pr_err("comedi_: usbduxfast%d: Could not alloc.urb\n", index);
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENOMEM;
}
usbduxfastsub[index].transfer_buffer = kmalloc(SIZEINBUF, GFP_KERNEL);
if (!usbduxfastsub[index].transfer_buffer) {
- printk(KERN_ERR "comedi_: usbduxfast%d: could not alloc. "
- "transb.\n", index);
+ pr_err("comedi_: usbduxfast%d: could not alloc. transb.\n",
+ index);
tidy_up(&(usbduxfastsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -1585,8 +1580,8 @@ static int usbduxfastsub_probe(struct usb_interface *uinterf,
return ret;
}
- printk(KERN_INFO "comedi_: usbduxfast%d has been successfully "
- "initialized.\n", index);
+ pr_info("comedi_: usbduxfast%d has been successfully initialized.\n",
+ index);
/* success */
return 0;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 03/25] Staging: comedi: fix printk issue in usbduxfast.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 01/25] Staging: comedi: fix printk issue in usbduxfast.c Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 02/25] Staging: comedi: fix printk issues " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 04/25] " Ravishankar Karkala Mallikarjunayya
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the usbduxfast.c file that fixes up a printk found
by the checkpatch.pl tool.
Used dev_*() functions instead of printks wherver possible and fixed
a quoted string split across line warnings.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbduxfast.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 32e3f65..4264552 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -291,11 +291,11 @@ static int usbduxfast_ai_cancel(struct comedi_device *dev,
/* force unlink of all urbs */
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi: usbduxfast_ai_cancel\n");
+ dev_dbg(dev->hw_dev, "comedi: usbduxfast_ai_cancel\n");
#endif
udfs = dev->private;
if (!udfs) {
- printk(KERN_ERR "comedi: usbduxfast_ai_cancel: udfs=NULL\n");
+ dev_err(dev->hw_dev, "comedi: usbduxfast_ai_cancel: udfs=NULL\n");
return -EFAULT;
}
down(&udfs->sem);
@@ -565,10 +565,10 @@ static int usbduxfast_ai_cmdtest(struct comedi_device *dev,
return -ENODEV;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast_ai_cmdtest\n", dev->minor);
- printk(KERN_DEBUG "comedi%d: usbduxfast: convert_arg=%u "
- "scan_begin_arg=%u\n",
- dev->minor, cmd->convert_arg, cmd->scan_begin_arg);
+ dev_dbg(dev->hw_dev, "comedi%d: usbduxfast_ai_cmdtest\n",
+ dev->minor);
+ dev_dbg(dev->hw_dev, "comedi%d: usbduxfast: convert_arg=%u scan_begin_arg=%u\n",
+ dev->minor, cmd->convert_arg, cmd->scan_begin_arg);
#endif
/* step 1: make sure trigger sources are trivially valid */
@@ -711,12 +711,12 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev,
return -ENODEV;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast_ai_inttrig\n", dev->minor);
+ dev_dbg(dev->hw_dev, "comedi%d: usbduxfast_ai_inttrig\n", dev->minor);
#endif
if (trignum != 0) {
- printk(KERN_ERR "comedi%d: usbduxfast_ai_inttrig: invalid"
- " trignum\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: usbduxfast_ai_inttrig: invalid trignum\n",
+ dev->minor);
up(&udfs->sem);
return -EINVAL;
}
@@ -724,16 +724,16 @@ static int usbduxfast_ai_inttrig(struct comedi_device *dev,
udfs->ai_cmd_running = 1;
ret = usbduxfastsub_submit_InURBs(udfs);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: usbduxfast_ai_inttrig: "
- "urbSubmit: err=%d\n", dev->minor, ret);
+ dev_err(dev->hw_dev, "comedi%d: usbduxfast_ai_inttrig: urbSubmit: err=%d\n",
+ dev->minor, ret);
udfs->ai_cmd_running = 0;
up(&udfs->sem);
return ret;
}
s->async->inttrig = NULL;
} else {
- printk(KERN_ERR "comedi%d: ai_inttrig but acqu is already"
- " running\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: ai_inttrig but acqu is already running\n",
+ dev->minor);
}
up(&udfs->sem);
return 1;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 04/25] Staging: comedi: fix printk issue in usbduxfast.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (2 preceding siblings ...)
2012-05-11 10:37 ` [PATCH 03/25] Staging: comedi: fix printk issue " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 05/25] " Ravishankar Karkala Mallikarjunayya
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the usbduxfast.c file that fixes up a printk found
by the checkpatch.pl tool.
Used dev_*() functions instead of printks wherver possible and fixed
a quoted string split across lines warnings.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbduxfast.c | 58 ++++++++++++--------------
1 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 4264552..57e3283 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -759,7 +759,7 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
long steps, steps_tmp;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast_ai_cmd\n", dev->minor);
+ dev_dbg(dev->hw_dev, "comedi%d: usbduxfast_ai_cmd\n", dev->minor);
#endif
udfs = dev->private;
if (!udfs)
@@ -771,8 +771,8 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
return -ENODEV;
}
if (udfs->ai_cmd_running) {
- printk(KERN_ERR "comedi%d: ai_cmd not possible. Another ai_cmd"
- " is running.\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: ai_cmd not possible. Another ai_cmd is running.\n",
+ dev->minor);
up(&udfs->sem);
return -EBUSY;
}
@@ -790,31 +790,29 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
for (i = 0; i < cmd->chanlist_len; ++i) {
chan = CR_CHAN(cmd->chanlist[i]);
if (chan != i) {
- printk(KERN_ERR "comedi%d: cmd is accepting "
- "only consecutive channels.\n",
- dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: cmd is accepting only consecutive channels.\n",
+ dev->minor);
up(&udfs->sem);
return -EINVAL;
}
if ((gain != CR_RANGE(cmd->chanlist[i]))
&& (cmd->chanlist_len > 3)) {
- printk(KERN_ERR "comedi%d: the gain must be"
- " the same for all channels.\n",
- dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: the gain must be the same for all channels.\n",
+ dev->minor);
up(&udfs->sem);
return -EINVAL;
}
if (i >= NUMCHANNELS) {
- printk(KERN_ERR "comedi%d: channel list too"
- " long\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: channel list too long\n",
+ dev->minor);
break;
}
}
}
steps = 0;
if (cmd->scan_begin_src == TRIG_TIMER) {
- printk(KERN_ERR "comedi%d: usbduxfast: "
- "scan_begin_src==TRIG_TIMER not valid.\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: scan_begin_src==TRIG_TIMER not valid.\n",
+ dev->minor);
up(&udfs->sem);
return -EINVAL;
}
@@ -822,28 +820,27 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
steps = (cmd->convert_arg * 30) / 1000;
if ((steps < MIN_SAMPLING_PERIOD) && (cmd->chanlist_len != 1)) {
- printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: steps=%ld, "
- "scan_begin_arg=%d. Not properly tested by cmdtest?\n",
- dev->minor, steps, cmd->scan_begin_arg);
+ dev_err(dev->hw_dev, "comedi%d: ai_cmd: steps=%ld, scan_begin_arg=%d. Not properly tested by cmdtest?\n",
+ dev->minor, steps, cmd->scan_begin_arg);
up(&udfs->sem);
return -EINVAL;
}
if (steps > MAX_SAMPLING_PERIOD) {
- printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: sampling rate "
- "too low.\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: ai_cmd: sampling rate too low.\n",
+ dev->minor);
up(&udfs->sem);
return -EINVAL;
}
if ((cmd->start_src == TRIG_EXT) && (cmd->chanlist_len != 1)
&& (cmd->chanlist_len != 16)) {
- printk(KERN_ERR "comedi%d: usbduxfast: ai_cmd: TRIG_EXT only"
- " with 1 or 16 channels possible.\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: ai_cmd: TRIG_EXT only with 1 or 16 channels possible.\n",
+ dev->minor);
up(&udfs->sem);
return -EINVAL;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: steps=%ld, convert_arg=%u\n",
- dev->minor, steps, cmd->convert_arg);
+ dev_dbg(dev->hw_dev, "comedi%d: steps=%ld, convert_arg=%u\n",
+ dev->minor, steps, cmd->convert_arg);
#endif
switch (cmd->chanlist_len) {
@@ -1154,30 +1151,29 @@ static int usbduxfast_ai_cmd(struct comedi_device *dev,
break;
default:
- printk(KERN_ERR "comedi %d: unsupported combination of "
- "channels\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: unsupported combination of channels\n",
+ dev->minor);
up(&udfs->sem);
return -EFAULT;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi %d: sending commands to the usb device\n",
- dev->minor);
+ dev_dbg(dev->hw_dev, "comedi%d: sending commands to the usb device\n",
+ dev->minor);
#endif
/* 0 means that the AD commands are sent */
result = send_dux_commands(udfs, SENDADCOMMANDS);
if (result < 0) {
- printk(KERN_ERR "comedi%d: adc command could not be submitted."
- "Aborting...\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: adc command could not be submitted.Aborting...\n",
+ dev->minor);
up(&udfs->sem);
return result;
}
if (cmd->stop_src == TRIG_COUNT) {
udfs->ai_sample_count = cmd->stop_arg * cmd->scan_end_arg;
if (udfs->ai_sample_count < 1) {
- printk(KERN_ERR "comedi%d: "
- "(cmd->stop_arg)*(cmd->scan_end_arg)<1, "
- "aborting.\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: (cmd->stop_arg)*(cmd->scan_end_arg)<1, aborting.\n",
+ dev->minor);
up(&udfs->sem);
return -EFAULT;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 05/25] Staging: comedi: fix printk issue in usbduxfast.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (3 preceding siblings ...)
2012-05-11 10:37 ` [PATCH 04/25] " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 06/25] " Ravishankar Karkala Mallikarjunayya
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the usbduxfast.c file that fixes up a printk found
by the checkpatch.pl tool.
Used dev_*() functions instead of printks wherver possible and fixed
a quoted string split across line warnings.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbduxfast.c | 38 +++++++++++++-------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 57e3283..e66c1f3 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -1222,13 +1222,13 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs = dev->private;
if (!udfs) {
- printk(KERN_ERR "comedi%d: ai_insn_read: no usb dev.\n",
- dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: ai_insn_read: no usb dev.\n",
+ dev->minor);
return -ENODEV;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: ai_insn_read, insn->n=%d, "
- "insn->subdev=%d\n", dev->minor, insn->n, insn->subdev);
+ dev_dbg(dev->hw_dev, "comedi%d: ai_insn_read, insn->n=%d, insn->subdev=%d\n",
+ dev->minor, insn->n, insn->subdev);
#endif
down(&udfs->sem);
if (!udfs->probed) {
@@ -1236,8 +1236,8 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
return -ENODEV;
}
if (udfs->ai_cmd_running) {
- printk(KERN_ERR "comedi%d: ai_insn_read not possible. Async "
- "Command is running.\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: ai_insn_read not possible. Async Command is running.\n",
+ dev->minor);
up(&udfs->sem);
return -EBUSY;
}
@@ -1291,21 +1291,21 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs->dux_commands[LOGBASE + 0] = 0;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi %d: sending commands to the usb device\n",
- dev->minor);
+ dev_dbg(dev->hw_dev, "comedi%d: sending commands to the usb device\n",
+ dev->minor);
#endif
/* 0 means that the AD commands are sent */
err = send_dux_commands(udfs, SENDADCOMMANDS);
if (err < 0) {
- printk(KERN_ERR "comedi%d: adc command could not be submitted."
- "Aborting...\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: adc command could not be submitted. Aborting...\n",
+ dev->minor);
up(&udfs->sem);
return err;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: submitting in-urb: "
- "0x%p,0x%p\n", udfs->comedidev->minor, udfs->urbIn->context,
- udfs->urbIn->dev);
+ dev_dbg(dev->hw_dev, "comedi%d: submitting in-urb: 0x%p,0x%p\n",
+ udfs->comedidev->minor, udfs->urbIn->context,
+ udfs->urbIn->dev);
#endif
for (i = 0; i < PACKETS_TO_IGNORE; i++) {
err = usb_bulk_msg(udfs->usbdev,
@@ -1313,8 +1313,8 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs->transfer_buffer, SIZEINBUF,
&actual_length, 10000);
if (err < 0) {
- printk(KERN_ERR "comedi%d: insn timeout. No data.\n",
- dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: insn timeout. No data.\n",
+ dev->minor);
up(&udfs->sem);
return err;
}
@@ -1326,15 +1326,15 @@ static int usbduxfast_ai_insn_read(struct comedi_device *dev,
udfs->transfer_buffer, SIZEINBUF,
&actual_length, 10000);
if (err < 0) {
- printk(KERN_ERR "comedi%d: insn data error: %d\n",
- dev->minor, err);
+ dev_err(dev->hw_dev, "comedi%d: insn data error: %d\n",
+ dev->minor, err);
up(&udfs->sem);
return err;
}
n = actual_length / sizeof(uint16_t);
if ((n % 16) != 0) {
- printk(KERN_ERR "comedi%d: insn data packet "
- "corrupted.\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: insn data packet corrupted.\n",
+ dev->minor);
up(&udfs->sem);
return -EINVAL;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 06/25] Staging: comedi: fix printk issue in usbduxfast.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (4 preceding siblings ...)
2012-05-11 10:37 ` [PATCH 05/25] " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 07/25] Staging: comedi: fix printk issues " Ravishankar Karkala Mallikarjunayya
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the usbduxfast.c file that fixes up a printk found
by the checkpatch.pl tool.
Used dev_*() functions instead of printks wherver possible and fixed
a quoted string split across line warnings.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbduxfast.c | 31 ++++++++++++--------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index e66c1f3..3824d51 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -1637,9 +1637,8 @@ static int usbduxfast_attach(struct comedi_device *dev,
}
if (index < 0) {
- printk(KERN_ERR "comedi%d: usbduxfast: error: attach failed, "
- "no usbduxfast devs connected to the usb bus.\n",
- dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: error: attach failed, no usbduxfast devs connected to the usb bus.\n",
+ dev->minor);
up(&start_stop_sem);
return -ENODEV;
}
@@ -1664,15 +1663,15 @@ static int usbduxfast_attach(struct comedi_device *dev,
/* allocate space for the subdevices */
ret = alloc_subdevices(dev, N_SUBDEVICES);
if (ret < 0) {
- printk(KERN_ERR "comedi%d: usbduxfast: error alloc space for "
- "subdev\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: error alloc space for subdev\n",
+ dev->minor);
up(&(usbduxfastsub[index].sem));
up(&start_stop_sem);
return ret;
}
- printk(KERN_INFO "comedi%d: usbduxfast: usb-device %d is attached to "
- "comedi.\n", dev->minor, index);
+ dev_info(dev->hw_dev, "comedi%d: usb-device %d is attached to comedi.\n",
+ dev->minor, index);
/* private structure is also simply the usb-structure */
dev->private = usbduxfastsub + index;
/* the first subdevice is the A/D converter */
@@ -1707,8 +1706,8 @@ static int usbduxfast_attach(struct comedi_device *dev,
up(&(usbduxfastsub[index].sem));
up(&start_stop_sem);
- printk(KERN_INFO "comedi%d: successfully attached to usbduxfast.\n",
- dev->minor);
+ dev_info(dev->hw_dev, "comedi%d: successfully attached to usbduxfast.\n",
+ dev->minor);
return 0;
}
@@ -1718,19 +1717,17 @@ static int usbduxfast_detach(struct comedi_device *dev)
struct usbduxfastsub_s *udfs;
if (!dev) {
- printk(KERN_ERR "comedi?: usbduxfast: detach without dev "
- "variable...\n");
+ dev_err(dev->hw_dev, "comedi?: detach without dev variable...\n");
return -EFAULT;
}
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: detach usb device\n",
- dev->minor);
+ dev_dbg(dev->hw_dev, "comedi%d: detach usb device\n",
+ dev->minor);
#endif
udfs = dev->private;
if (!udfs) {
- printk(KERN_ERR "comedi?: usbduxfast: detach without ptr to "
- "usbduxfastsub[]\n");
+ dev_err(dev->hw_dev, "comedi?: detach without ptr to usbduxfastsub[]\n");
return -EFAULT;
}
@@ -1744,8 +1741,8 @@ static int usbduxfast_detach(struct comedi_device *dev)
udfs->attached = 0;
udfs->comedidev = NULL;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi%d: usbduxfast: detach: successfully "
- "removed\n", dev->minor);
+ dev_dbg(dev->hw_dev, "comedi%d: detach: successfully removed\n",
+ dev->minor);
#endif
up(&start_stop_sem);
up(&udfs->sem);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 07/25] Staging: comedi: fix printk issues in usbduxfast.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (5 preceding siblings ...)
2012-05-11 10:37 ` [PATCH 06/25] " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 08/25] Staging: comedi: fix printk issue in rti800.c Ravishankar Karkala Mallikarjunayya
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the usbduxfast.c file that fixes up a printk found
by checkpatch.pl tool.
i.e. WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ...
WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
WARNING: quoted string split across lines.
WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbduxfast.c | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxfast.c b/drivers/staging/comedi/drivers/usbduxfast.c
index 3824d51..e9c556c 100644
--- a/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/drivers/staging/comedi/drivers/usbduxfast.c
@@ -499,9 +499,9 @@ static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,
int ret;
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi: usbduxfast: uploading %d bytes", len);
- printk(KERN_DEBUG " to addr %d, first byte=%d.\n",
- startAddr, local_transfer_buffer[0]);
+ pr_debug("comedi: usbduxfast: uploading %d bytes", len);
+ pr_cont(" to addr %d, first byte=%d.\n", startAddr,
+ local_transfer_buffer[0]);
#endif
/* brequest, firmware */
ret = usb_control_msg(udfs->usbdev, usb_sndctrlpipe(udfs->usbdev, 0),
@@ -515,11 +515,11 @@ static int usbduxfastsub_upload(struct usbduxfastsub_s *udfs,
EZTIMEOUT); /* timeout */
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi_: usbduxfast: result=%d\n", ret);
+ pr_debug("comedi_: usbduxfast: result=%d\n", ret);
#endif
if (ret < 0) {
- printk(KERN_ERR "comedi_: usbduxfast: uppload failed\n");
+ pr_err("comedi_: usbduxfast: uppload failed\n");
return ret;
}
@@ -1401,7 +1401,7 @@ static int firmwareUpload(struct usbduxfastsub_s *usbduxfastsub,
static void tidy_up(struct usbduxfastsub_s *udfs)
{
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi_: usbduxfast: tiding up\n");
+ pr_debug("comedi_: usbduxfast: tiding up\n");
#endif
if (!udfs)
@@ -1588,13 +1588,11 @@ static void usbduxfastsub_disconnect(struct usb_interface *intf)
struct usb_device *udev = interface_to_usbdev(intf);
if (!udfs) {
- printk(KERN_ERR "comedi_: usbduxfast: disconnect called with "
- "null pointer.\n");
+ pr_err("comedi_: usbduxfast: disconnect called with null pointer.\n");
return;
}
if (udfs->usbdev != udev) {
- printk(KERN_ERR "comedi_: usbduxfast: BUG! called with wrong "
- "ptr!!!\n");
+ pr_err("comedi_: usbduxfast: BUG! called with wrong ptr!!!\n");
return;
}
@@ -1607,7 +1605,7 @@ static void usbduxfastsub_disconnect(struct usb_interface *intf)
up(&start_stop_sem);
#ifdef CONFIG_COMEDI_DEBUG
- printk(KERN_DEBUG "comedi_: usbduxfast: disconnected from the usb\n");
+ pr_debug("comedi_: usbduxfast: disconnected from the usb\n");
#endif
}
@@ -1790,8 +1788,7 @@ static struct usb_driver usbduxfastsub_driver = {
*/
static int __init init_usbduxfast(void)
{
- printk(KERN_INFO
- KBUILD_MODNAME ": " DRIVER_VERSION ":" DRIVER_DESC "\n");
+ pr_info(KBUILD_MODNAME ": " DRIVER_VERSION ":" DRIVER_DESC "\n");
usb_register(&usbduxfastsub_driver);
comedi_driver_register(&driver_usbduxfast);
return 0;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 08/25] Staging: comedi: fix printk issue in rti800.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (6 preceding siblings ...)
2012-05-11 10:37 ` [PATCH 07/25] Staging: comedi: fix printk issues " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 09/25] Staging: comedi: fix printk issue in rti802.c Ravishankar Karkala Mallikarjunayya
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the rti800.c file that fixes up a printk found
by the checkpatch.pl tool.
Used dev_*() functions instead of printks wherver possible.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/rti800.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c
index 9e082b3..b79d89c 100644
--- a/drivers/staging/comedi/drivers/rti800.c
+++ b/drivers/staging/comedi/drivers/rti800.c
@@ -205,7 +205,7 @@ static int rti800_ai_insn_read(struct comedi_device *dev,
for (t = RTI800_TIMEOUT; t; t--) {
status = inb(dev->iobase + RTI800_CSR);
if (status & RTI800_OVERRUN) {
- printk(KERN_WARNING "rti800: a/d overrun\n");
+ dev_warn(dev->hw_dev, "a/d overrun\n");
outb(0, dev->iobase + RTI800_CLRFLAGS);
return -EIO;
}
@@ -214,7 +214,7 @@ static int rti800_ai_insn_read(struct comedi_device *dev,
udelay(1);
}
if (t == 0) {
- printk(KERN_WARNING "rti800: timeout\n");
+ dev_warn(dev->hw_dev, "timeout\n");
return -ETIME;
}
data[i] = inb(dev->iobase + RTI800_ADCLO);
@@ -315,19 +315,19 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_subdevice *s;
iobase = it->options[0];
- printk(KERN_INFO "comedi%d: rti800: 0x%04lx\n", dev->minor, iobase);
+ dev_info(dev->hw_dev, "comedi%d: 0x%04lx\n", dev->minor, iobase);
if (!request_region(iobase, RTI800_SIZE, "rti800")) {
- printk(KERN_WARNING "I/O port conflict\n");
+ dev_warn(dev->hw_dev, "I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
#ifdef DEBUG
- printk(KERN_DEBUG "fingerprint=%x,%x,%x,%x,%x ",
- inb(dev->iobase + 0),
- inb(dev->iobase + 1),
- inb(dev->iobase + 2),
- inb(dev->iobase + 3), inb(dev->iobase + 4));
+ dev_dbg(dev->hw_dev, "fingerprint=%x,%x,%x,%x,%x ",
+ inb(dev->iobase + 0),
+ inb(dev->iobase + 1),
+ inb(dev->iobase + 2),
+ inb(dev->iobase + 3), inb(dev->iobase + 4));
#endif
outb(0, dev->iobase + RTI800_CSR);
@@ -336,15 +336,15 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
irq = it->options[1];
if (irq) {
- printk(KERN_INFO "( irq = %u )\n", irq);
+ dev_info(dev->hw_dev, "( irq = %u )\n", irq);
ret = request_irq(irq, rti800_interrupt, 0, "rti800", dev);
if (ret < 0) {
- printk(KERN_WARNING " Failed to allocate IRQ\n");
+ dev_warn(dev->hw_dev, "Failed to allocate IRQ\n");
return ret;
}
dev->irq = irq;
} else {
- printk(KERN_INFO "( no irq )\n");
+ dev_info(dev->hw_dev, "( no irq )\n");
}
dev->board_name = this_board->name;
@@ -445,7 +445,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int rti800_detach(struct comedi_device *dev)
{
- printk(KERN_INFO "comedi%d: rti800: remove\n", dev->minor);
+ dev_info(dev->hw_dev, "comedi%d: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, RTI800_SIZE);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 09/25] Staging: comedi: fix printk issue in rti802.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (7 preceding siblings ...)
2012-05-11 10:37 ` [PATCH 08/25] Staging: comedi: fix printk issue in rti800.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 10/25] Staging: comedi: fix printk issue in s526.c Ravishankar Karkala Mallikarjunayya
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the rti802.c file that fixes up a printk found
by the checkpatch.pl tool.
Used dev_*() functions instead of printks.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/rti802.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c
index 21baf1a..202d830 100644
--- a/drivers/staging/comedi/drivers/rti802.c
+++ b/drivers/staging/comedi/drivers/rti802.c
@@ -94,9 +94,9 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;
iobase = it->options[0];
- printk(KERN_INFO "comedi%d: rti802: 0x%04lx ", dev->minor, iobase);
+ dev_info(dev->hw_dev, "comedi%d: 0x%04lx\n", dev->minor, iobase);
if (!request_region(iobase, RTI802_SIZE, "rti802")) {
- printk(KERN_WARNING "I/O port conflict\n");
+ dev_warn(dev->hw_dev, "I/O port conflict\n");
return -EIO;
}
dev->iobase = iobase;
@@ -131,7 +131,7 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int rti802_detach(struct comedi_device *dev)
{
- printk(KERN_INFO "comedi%d: rti802: remove\n", dev->minor);
+ dev_info(dev->hw_dev, "comedi%d: remove\n", dev->minor);
if (dev->iobase)
release_region(dev->iobase, RTI802_SIZE);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 10/25] Staging: comedi: fix printk issue in s526.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (8 preceding siblings ...)
2012-05-11 10:37 ` [PATCH 09/25] Staging: comedi: fix printk issue in rti802.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:37 ` [PATCH 11/25] Staging: comedi: fix printk issue in s626.c Ravishankar Karkala Mallikarjunayya
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the s526.c file that fixes up a printk found
by the checkpatch.pl tool.
Used dev_<level> functions instead of printks wherver possible.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/s526.c | 50 ++++++++++++++++----------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/comedi/drivers/s526.c b/drivers/staging/comedi/drivers/s526.c
index ffe4362..c921055 100644
--- a/drivers/staging/comedi/drivers/s526.c
+++ b/drivers/staging/comedi/drivers/s526.c
@@ -241,7 +241,7 @@ static int s526_gpct_rinsn(struct comedi_device *dev,
/* Check if (n > 0) */
if (insn->n <= 0) {
- printk(KERN_ERR "s526: INSN_READ: n should be > 0\n");
+ dev_err(dev->hw_dev, "INSN_READ: n should be > 0\n");
return -EINVAL;
}
/* Read the low word first */
@@ -284,7 +284,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
data[2]: Pre-load Register Value
data[3]: Conter Control Register
*/
- printk(KERN_INFO "s526: GPCT_INSN_CONFIG: Configuring Encoder\n");
+ dev_info(dev->hw_dev, "GPCT_INSN_CONFIG: Configuring Encoder\n");
devpriv->s526_gpct_config[subdev_channel].app =
PositionMeasurement;
@@ -391,7 +391,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
data[3]: Pre-load Register 1 Value
data[4]: Conter Control Register
*/
- printk(KERN_INFO "s526: GPCT_INSN_CONFIG: Configuring SPG\n");
+ dev_info(dev->hw_dev, "GPCT_INSN_CONFIG: Configuring SPG\n");
devpriv->s526_gpct_config[subdev_channel].app =
SinglePulseGeneration;
@@ -436,7 +436,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
data[3]: Pre-load Register 1 Value
data[4]: Conter Control Register
*/
- printk(KERN_INFO "s526: GPCT_INSN_CONFIG: Configuring PTG\n");
+ dev_info(dev->hw_dev, "GPCT_INSN_CONFIG: Configuring PTG\n");
devpriv->s526_gpct_config[subdev_channel].app =
PulseTrainGeneration;
@@ -474,7 +474,7 @@ static int s526_gpct_insn_config(struct comedi_device *dev,
break;
default:
- printk(KERN_ERR "s526: unsupported GPCT_insn_config\n");
+ dev_err(dev->hw_dev, "unsupported GPCT_insn_config\n");
return -EINVAL;
break;
}
@@ -490,21 +490,21 @@ static int s526_gpct_winsn(struct comedi_device *dev,
short value;
union cmReg cmReg;
- printk(KERN_INFO "s526: GPCT_INSN_WRITE on channel %d\n",
- subdev_channel);
+ dev_info(dev->hw_dev, "GPCT_INSN_WRITE on channel %d\n",
+ subdev_channel);
cmReg.value = inw(ADDR_CHAN_REG(REG_C0M, subdev_channel));
- printk(KERN_INFO "s526: Counter Mode Register: %x\n", cmReg.value);
+ dev_info(dev->hw_dev, "Counter Mode Register: %x\n", cmReg.value);
/* Check what Application of Counter this channel is configured for */
switch (devpriv->s526_gpct_config[subdev_channel].app) {
case PositionMeasurement:
- printk(KERN_INFO "S526: INSN_WRITE: PM\n");
+ dev_info(dev->hw_dev, "INSN_WRITE: PM\n");
outw(0xFFFF & ((*data) >> 16), ADDR_CHAN_REG(REG_C0H,
subdev_channel));
outw(0xFFFF & (*data), ADDR_CHAN_REG(REG_C0L, subdev_channel));
break;
case SinglePulseGeneration:
- printk(KERN_INFO "S526: INSN_WRITE: SPG\n");
+ dev_info(dev->hw_dev, "INSN_WRITE: SPG\n");
outw(0xFFFF & ((*data) >> 16), ADDR_CHAN_REG(REG_C0H,
subdev_channel));
outw(0xFFFF & (*data), ADDR_CHAN_REG(REG_C0L, subdev_channel));
@@ -517,14 +517,14 @@ static int s526_gpct_winsn(struct comedi_device *dev,
The above periods must be expressed as a multiple of the
pulse frequency on the selected source
*/
- printk(KERN_INFO "S526: INSN_WRITE: PTG\n");
+ dev_info(dev->hw_dev, "INSN_WRITE: PTG\n");
if ((insn->data[1] > insn->data[0]) && (insn->data[0] > 0)) {
(devpriv->s526_gpct_config[subdev_channel]).data[0] =
insn->data[0];
(devpriv->s526_gpct_config[subdev_channel]).data[1] =
insn->data[1];
} else {
- printk(KERN_ERR "s526: INSN_WRITE: PTG: Problem with Pulse params -> %d %d\n",
+ dev_err(dev->hw_dev, "INSN_WRITE: PTG: Problem with Pulse params -> %d %d\n",
insn->data[0], insn->data[1]);
return -EINVAL;
}
@@ -613,8 +613,8 @@ static int s526_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
if (i == TIMEOUT) {
/* printk() should be used instead of printk()
* whenever the code can be called from real-time. */
- printk(KERN_ERR "s526: ADC(0x%04x) timeout\n",
- inw(ADDR_REG(REG_ISR)));
+ dev_err(dev->hw_dev, "ADC(0x%04x) timeout\n",
+ inw(ADDR_REG(REG_ISR)));
return -ETIMEDOUT;
}
@@ -712,7 +712,7 @@ static int s526_dio_insn_config(struct comedi_device *dev,
int chan = CR_CHAN(insn->chanspec);
int group, mask;
- printk(KERN_INFO "S526 DIO insn_config\n");
+ dev_info(dev->hw_dev, "S526 DIO insn_config\n");
/* The input or output configuration of each digital line is
* configured by a special insn_config instruction. chanspec
@@ -897,12 +897,12 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
cmReg.reg.reserved = 0;
n = 0;
- printk(KERN_INFO "Mode reg=0x%04x, 0x%04lx\n",
- cmReg.value, ADDR_CHAN_REG(REG_C0M, n));
+ dev_info(dev->hw_dev, "Mode reg=0x%04x, 0x%04lx\n",
+ cmReg.value, ADDR_CHAN_REG(REG_C0M, n));
outw(cmReg.value, ADDR_CHAN_REG(REG_C0M, n));
udelay(1000);
- printk(KERN_INFO "Read back mode reg=0x%04x\n",
- inw(ADDR_CHAN_REG(REG_C0M, n)));
+ dev_info(dev->hw_dev, "Read back mode reg=0x%04x\n",
+ inw(ADDR_CHAN_REG(REG_C0M, n)));
/* Load the pre-load register high word */
/* value = (short) (0x55); */
@@ -925,22 +925,22 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it)
outw(cmReg.value, ADDR_CHAN_REG(REG_C0M, n));
udelay(1000);
- printk(KERN_INFO "Read back mode reg=0x%04x\n",
- inw(ADDR_CHAN_REG(REG_C0M, n)));
+ dev_info(dev->hw_dev, "Read back mode reg=0x%04x\n",
+ inw(ADDR_CHAN_REG(REG_C0M, n)));
#endif
- printk(KERN_INFO "Current registres:\n");
+ dev_info(dev->hw_dev, "Current registres:\n");
for (i = 0; i < S526_NUM_PORTS; i++) {
- printk(KERN_INFO "0x%02lx: 0x%04x\n",
- ADDR_REG(s526_ports[i]), inw(ADDR_REG(s526_ports[i])));
+ dev_info(dev->hw_dev, "0x%02lx: 0x%04x\n",
+ ADDR_REG(s526_ports[i]), inw(ADDR_REG(s526_ports[i])));
}
return 1;
}
static int s526_detach(struct comedi_device *dev)
{
- printk(KERN_INFO "comedi%d: s526: remove\n", dev->minor);
+ dev_info(dev->hw_dev, "comedi%d: remove\n", dev->minor);
if (dev->iobase > 0)
release_region(dev->iobase, S526_IOSIZE);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 11/25] Staging: comedi: fix printk issue in s626.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (9 preceding siblings ...)
2012-05-11 10:37 ` [PATCH 10/25] Staging: comedi: fix printk issue in s526.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:37 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 12/25] Staging: comedi: Checkpatch cleanups Ravishankar Karkala Mallikarjunayya
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:37 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the s626.c file that fixes up a printk found
by the checkpatch.pl tool.
Used dev_<level> functions instead of printks wherver possible.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/s626.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index a0b7c71..aef9a3d 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -590,13 +590,13 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
devpriv->pdev = pdev;
if (pdev == NULL) {
- printk(KERN_ERR "s626_attach: Board not present!!!\n");
+ dev_err(dev->hw_dev, "Board not present!!!\n");
return -ENODEV;
}
result = comedi_pci_enable(pdev, "s626");
if (result < 0) {
- printk(KERN_ERR "s626_attach: comedi_pci_enable fails\n");
+ dev_err(dev->hw_dev, "comedi_pci_enable fails\n");
return -ENODEV;
}
devpriv->got_regions = 1;
@@ -605,7 +605,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
devpriv->base_addr = ioremap(resourceStart, SIZEOF_ADDRESS_SPACE);
if (devpriv->base_addr == NULL) {
- printk(KERN_ERR "s626_attach: IOREMAP failed\n");
+ dev_err(dev->hw_dev, "IOREMAP failed\n");
return -ENODEV;
}
@@ -626,7 +626,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma);
if (devpriv->ANABuf.LogicalBase == NULL) {
- printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
+ dev_err(dev->hw_dev, "DMA Memory mapping error\n");
return -ENOMEM;
}
@@ -643,7 +643,7 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
pci_alloc_consistent(devpriv->pdev, DMABUF_SIZE, &appdma);
if (devpriv->RPSBuf.LogicalBase == NULL) {
- printk(KERN_ERR "s626_attach: DMA Memory mapping error\n");
+ dev_err(dev->hw_dev, "DMA Memory mapping error\n");
return -ENOMEM;
}
@@ -669,13 +669,13 @@ static int s626_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* set up interrupt handler */
if (dev->irq == 0) {
- printk(KERN_ERR " unknown irq (bad)\n");
+ dev_err(dev->hw_dev, "unknown irq (bad)\n");
} else {
ret = request_irq(dev->irq, s626_irq_handler, IRQF_SHARED,
"s626", dev);
if (ret < 0) {
- printk(KERN_ERR " irq not available\n");
+ dev_err(dev->hw_dev, "irq not available\n");
dev->irq = 0;
}
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 12/25] Staging: comedi: Checkpatch cleanups.
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (10 preceding siblings ...)
2012-05-11 10:37 ` [PATCH 11/25] Staging: comedi: fix printk issue in s626.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 13/25] " Ravishankar Karkala Mallikarjunayya
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
drivers/staging/comedi/drivers/s626.c:1422: ERROR: "foo * bar" should be "foo *bar"
drivers/staging/comedi/drivers/s626.c:1422: ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/s626.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index aef9a3d..b7f36e4 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -321,7 +321,7 @@ static unsigned int s626_ai_reg_to_uint(int data);
/* internal routines */
static void s626_dio_init(struct comedi_device *dev);
-static void ResetADC(struct comedi_device *dev, uint8_t * ppl);
+static void ResetADC(struct comedi_device *dev, uint8_t *ppl);
static void LoadTrimDACs(struct comedi_device *dev);
static void WriteTrimDAC(struct comedi_device *dev, uint8_t LogicalChan,
uint8_t DacData);
@@ -1419,7 +1419,7 @@ static int s626_detach(struct comedi_device *dev)
/*
* this functions build the RPS program for hardware driven acquistion
*/
-void ResetADC(struct comedi_device *dev, uint8_t * ppl)
+void ResetADC(struct comedi_device *dev, uint8_t *ppl)
{
register uint32_t *pRPS;
uint32_t JmpAdrs;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 13/25] Staging: comedi: Checkpatch cleanups.
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (11 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 12/25] Staging: comedi: Checkpatch cleanups Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 14/25] Staging: comedi: fix printk issue in serial2002.c Ravishankar Karkala Mallikarjunayya
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
drivers/staging/comedi/drivers/das6402.c:244: ERROR: "foo * bar" should be "foo *bar"
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/das6402.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index f256841..893d850 100644
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -241,7 +241,7 @@ static int das6402_ai_cancel(struct comedi_device *dev,
#ifdef unused
static int das6402_ai_mode2(struct comedi_device *dev,
- struct comedi_subdevice *s, comedi_trig * it)
+ struct comedi_subdevice *s, comedi_trig *it)
{
devpriv->das6402_ignoreirq = 1;
dev_dbg(dev->hw_dev, "Starting acquisition\n");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 14/25] Staging: comedi: fix printk issue in serial2002.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (12 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 13/25] " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 15/25] Staging: comedi: fix printk issue in unioxx5.c Ravishankar Karkala Mallikarjunayya
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the serial2002.c file that fixes up a
printk warning found by the checkpatch.pl tool.
This patch converts a printks to pr_<level> and used dev_<level>
function wherver possible.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/serial2002.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index a034b10..5a5a781 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -287,7 +287,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);
@@ -360,7 +360,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->hw_dev, "file open error = %d\n", result);
} else {
struct config_t {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 15/25] Staging: comedi: fix printk issue in unioxx5.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (13 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 14/25] Staging: comedi: fix printk issue in serial2002.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 16/25] Staging: comedi: fix printk issues " Ravishankar Karkala Mallikarjunayya
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the unioxx5.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<level> functions.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/unioxx5.c | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c
index f45824f..8cba339 100644
--- a/drivers/staging/comedi/drivers/unioxx5.c
+++ b/drivers/staging/comedi/drivers/unioxx5.c
@@ -154,13 +154,12 @@ static int unioxx5_attach(struct comedi_device *dev,
/* unioxx5 can has from two to four subdevices */
if (n_subd < 2) {
- printk(KERN_ERR
- "your card must has at least 2 'g01' subdevices\n");
+ dev_err(dev->hw_dev, "your card must has at least 2 'g01' subdevices\n");
return -1;
}
if (alloc_subdevices(dev, n_subd) < 0) {
- printk(KERN_ERR "out of memory\n");
+ dev_err(dev->hw_dev, "out of memory\n");
return -ENOMEM;
}
@@ -171,7 +170,7 @@ static int unioxx5_attach(struct comedi_device *dev,
return -1;
}
- printk(KERN_INFO "attached\n");
+ dev_info(dev->hw_dev, "attached\n");
return 0;
}
@@ -231,17 +230,15 @@ static int unioxx5_insn_config(struct comedi_device *dev,
type = usp->usp_module_type[channel / 2];
if (type != MODULE_DIGITAL) {
- printk(KERN_ERR
- "comedi%d: channel configuration accessible only for digital modules\n",
- dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: channel configuration accessible only for digital modules\n",
+ dev->minor);
return -1;
}
channel_offset = __unioxx5_define_chan_offset(channel);
if (channel_offset < 0) {
- printk(KERN_ERR
- "comedi%d: undefined channel %d. channel range is 0 .. 23\n",
- dev->minor, channel);
+ dev_err(dev->hw_dev, "comedi%d: undefined channel %d. channel range is 0 .. 23\n",
+ dev->minor, channel);
return -1;
}
@@ -256,7 +253,7 @@ static int unioxx5_insn_config(struct comedi_device *dev,
flags |= mask;
break;
default:
- printk(KERN_ERR "comedi%d: unknown flag\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: unknown flag\n", dev->minor);
return -1;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 16/25] Staging: comedi: fix printk issues in unioxx5.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (14 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 15/25] Staging: comedi: fix printk issue in unioxx5.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 17/25] Staging: comedi: fix line over 80 character issue " Ravishankar Karkala Mallikarjunayya
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the unioxx5.c file that fixes up a
printk warning found by the checkpatch.pl tool.
i.e. WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ...
WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/unioxx5.c | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c
index 8cba339..1823642 100644
--- a/drivers/staging/comedi/drivers/unioxx5.c
+++ b/drivers/staging/comedi/drivers/unioxx5.c
@@ -296,19 +296,19 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
int i, to, ndef_flag = 0;
if (!request_region(subdev_iobase, UNIOXX5_SIZE, DRIVER_NAME)) {
- printk(KERN_ERR "comedi%d: I/O port conflict\n", minor);
+ pr_err("comedi%d: I/O port conflict\n", minor);
return -EIO;
}
usp = kzalloc(sizeof(*usp), GFP_KERNEL);
if (usp == NULL) {
- printk(KERN_ERR "comedi%d: error! --> out of memory!\n", minor);
+ pr_err("comedi%d: error! --> out of memory!\n", minor);
return -1;
}
usp->usp_iobase = subdev_iobase;
- printk(KERN_INFO "comedi%d: |", minor);
+ pr_info("comedi%d: |", minor);
/* defining modules types */
for (i = 0; i < 12; i++) {
@@ -336,11 +336,11 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
} else
usp->usp_module_type[i] = inb(subdev_iobase + 6);
- printk(" [%d] 0x%02x |", i, usp->usp_module_type[i]);
+ pr_cont(" [%d] 0x%02x |", i, usp->usp_module_type[i]);
udelay(1);
}
- printk("\n");
+ pr_cont("\n");
/* initial subdevice for digital or analog i/o */
subdev->type = COMEDI_SUBD_DIO;
@@ -354,7 +354,7 @@ static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
/* for digital modules only!!! */
subdev->insn_config = unioxx5_insn_config;
- printk(KERN_INFO "subdevice configured\n");
+ pr_info("subdevice configured\n");
return 0;
}
@@ -367,8 +367,7 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp,
channel_offset = __unioxx5_define_chan_offset(channel);
if (channel_offset < 0) {
- printk(KERN_ERR
- "comedi%d: undefined channel %d. channel range is 0 .. 23\n",
+ pr_err("comedi%d: undefined channel %d. channel range is 0 .. 23\n",
minor, channel);
return 0;
}
@@ -396,8 +395,7 @@ static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp,
channel_offset = __unioxx5_define_chan_offset(channel);
if (channel_offset < 0) {
- printk(KERN_ERR
- "comedi%d: undefined channel %d. channel range is 0 .. 23\n",
+ pr_err("comedi%d: undefined channel %d. channel range is 0 .. 23\n",
minor, channel);
return 0;
}
@@ -438,8 +436,7 @@ static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp,
/* defining if given module can work on output */
if (!(usp->usp_module_type[module] & MODULE_OUTPUT_MASK)) {
- printk(KERN_ERR
- "comedi%d: module in position %d with id 0x%0x is for input only!\n",
+ pr_err("comedi%d: module in position %d with id 0x%0x is for input only!\n",
minor, module, usp->usp_module_type[module]);
return 0;
}
@@ -476,8 +473,7 @@ static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp,
/* defining if given module can work on input */
if (usp->usp_module_type[module_no] & MODULE_OUTPUT_MASK) {
- printk(KERN_ERR
- "comedi%d: module in position %d with id 0x%02x is for output only",
+ pr_err("comedi%d: module in position %d with id 0x%02x is for output only",
minor, module_no, usp->usp_module_type[module_no]);
return 0;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 17/25] Staging: comedi: fix line over 80 character issue in unioxx5.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (15 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 16/25] Staging: comedi: fix printk issues " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 18/25] Staging: comedi: Checkpatch cleanups Ravishankar Karkala Mallikarjunayya
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the unioxx5.c file that fixes up a line
over 80 character warning found by the checkpatch.pl tool.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/unioxx5.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c
index 1823642..bb278bf 100644
--- a/drivers/staging/comedi/drivers/unioxx5.c
+++ b/drivers/staging/comedi/drivers/unioxx5.c
@@ -101,7 +101,10 @@ static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp,
unsigned int *data, int channel, int minor);
static int __unioxx5_digital_read(struct unioxx5_subd_priv *usp,
unsigned int *data, int channel, int minor);
-/* static void __unioxx5_digital_config(struct unioxx5_subd_priv* usp, int mode); */
+/*
+ * static void __unioxx5_digital_config(struct unioxx5_subd_priv* usp,
+ * int mode);
+ */
static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp,
unsigned int *data, int channel, int minor);
static int __unioxx5_analog_read(struct unioxx5_subd_priv *usp,
@@ -141,7 +144,10 @@ static int unioxx5_attach(struct comedi_device *dev,
dev->iobase = iobase;
iobase += UNIOXX5_SUBDEV_BASE;
- /* defining number of subdevices and getting they types (it must be 'g01') */
+ /*
+ * defining number of subdevices and getting they types
+ * (it must be 'g01')
+ */
for (i = n_subd = 0, ba = iobase; i < 4; i++, ba += UNIOXX5_SUBDEV_ODDS) {
id = inb(ba + 0xE);
num = inb(ba + 0xF);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 18/25] Staging: comedi: Checkpatch cleanups.
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (16 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 17/25] Staging: comedi: fix line over 80 character issue " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 19/25] " Ravishankar Karkala Mallikarjunayya
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
drivers/staging/comedi/drivers/usbdux.c:1119: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:1139: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:1149: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:1222: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:1276: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:1623: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2345: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2364: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2388: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2397: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2406: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2415: WARNING: quoted string split across lines
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbdux.c | 73 +++++++++++++-----------------
1 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index 3d300ef..bd71671 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -1115,9 +1115,9 @@ static int send_dux_commands(struct usbduxsub *this_usbduxsub, int cmd_type)
this_usbduxsub->dux_commands, SIZEOFDUXBUFFER,
&nsent, BULK_TIMEOUT);
if (result < 0)
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
- "could not transmit dux_command to the usb-device, "
- "err=%d\n", this_usbduxsub->comedidev->minor, result);
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: could not transmit dux_command to the usb-device, err=%d\n",
+ this_usbduxsub->comedidev->minor, result);
return result;
}
@@ -1135,9 +1135,9 @@ static int receive_dux_commands(struct usbduxsub *this_usbduxsub, int command)
this_usbduxsub->insnBuffer, SIZEINSNBUF,
&nrec, BULK_TIMEOUT);
if (result < 0) {
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
- "insn: USB error %d while receiving DUX command"
- "\n", this_usbduxsub->comedidev->minor, result);
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: insn: USB error %d while receiving DUX command\n",
+ this_usbduxsub->comedidev->minor, result);
return result;
}
if (le16_to_cpu(this_usbduxsub->insnBuffer[0]) == command)
@@ -1145,8 +1145,8 @@ static int receive_dux_commands(struct usbduxsub *this_usbduxsub, int command)
}
/* this is only reached if the data has been requested a couple of
* times */
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: insn: "
- "wrong data returned from firmware: want cmd %d, got cmd %d.\n",
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: insn: wrong data returned from firmware: want cmd %d, got cmd %d.\n",
this_usbduxsub->comedidev->minor, command,
le16_to_cpu(this_usbduxsub->insnBuffer[0]));
return -EFAULT;
@@ -1218,9 +1218,9 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
return -ENODEV;
}
if (this_usbduxsub->ai_cmd_running) {
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
- "ai_cmd not possible. Another ai_cmd is running.\n",
- dev->minor);
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: ai_cmd not possible. Another ai_cmd is running.\n",
+ dev->minor);
up(&this_usbduxsub->sem);
return -EBUSY;
}
@@ -1272,10 +1272,10 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
this_usbduxsub->ai_timer = cmd->scan_begin_arg / 1000000;
}
if (this_usbduxsub->ai_timer < 1) {
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: ai_cmd: "
- "timer=%d, scan_begin_arg=%d. "
- "Not properly tested by cmdtest?\n", dev->minor,
- this_usbduxsub->ai_timer, cmd->scan_begin_arg);
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: ai_cmd: timer=%d, scan_begin_arg=%d. Not properly tested by cmdtest?\n",
+ dev->minor, this_usbduxsub->ai_timer,
+ cmd->scan_begin_arg);
up(&this_usbduxsub->sem);
return -EINVAL;
}
@@ -1337,8 +1337,8 @@ static int usbdux_ai_insn_read(struct comedi_device *dev,
}
if (this_usbduxsub->ai_cmd_running) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: ai_insn_read not possible. "
- "Async Command is running.\n", dev->minor);
+ "comedi%d: ai_insn_read not possible. Async Command is running.\n",
+ dev->minor);
up(&this_usbduxsub->sem);
return 0;
}
@@ -1619,10 +1619,10 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
}
}
- dev_dbg(&this_usbduxsub->interface->dev, "comedi%d: err=%d, "
- "scan_begin_src=%d, scan_begin_arg=%d, convert_src=%d, "
- "convert_arg=%d\n", dev->minor, err, cmd->scan_begin_src,
- cmd->scan_begin_arg, cmd->convert_src, cmd->convert_arg);
+ dev_dbg(&this_usbduxsub->interface->dev,
+ "comedi%d: err=%d, scan_begin_src=%d, scan_begin_arg=%d, convert_src=%d, convert_arg=%d\n",
+ dev->minor, err, cmd->scan_begin_src, cmd->scan_begin_arg,
+ cmd->convert_src, cmd->convert_arg);
if (err)
return 3;
@@ -1676,18 +1676,15 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* timing of the scan: we get all channels at once */
this_usbduxsub->ao_timer = cmd->scan_begin_arg / 1000000;
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: scan_begin_src=%d, scan_begin_arg=%d, "
- "convert_src=%d, convert_arg=%d\n", dev->minor,
- cmd->scan_begin_src, cmd->scan_begin_arg,
+ "comedi%d: scan_begin_src=%d, scan_begin_arg=%d, convert_src=%d, convert_arg=%d\n",
+ dev->minor, cmd->scan_begin_src, cmd->scan_begin_arg,
cmd->convert_src, cmd->convert_arg);
dev_dbg(&this_usbduxsub->interface->dev,
"comedi%d: ao_timer=%d (ms)\n",
dev->minor, this_usbduxsub->ao_timer);
if (this_usbduxsub->ao_timer < 1) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux: ao_timer=%d, "
- "scan_begin_arg=%d. "
- "Not properly tested by cmdtest?\n",
+ "comedi%d: ao_timer=%d, scan_begin_arg=%d. Not properly tested by cmdtest?\n",
dev->minor, this_usbduxsub->ao_timer,
cmd->scan_begin_arg);
up(&this_usbduxsub->sem);
@@ -2341,8 +2338,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
int index;
int ret;
- dev_dbg(dev, "comedi_: usbdux_: "
- "finding a free structure for the usb-device\n");
+ dev_dbg(dev, "comedi_: finding a free structure for the usb-device\n");
down(&start_stop_sem);
/* look for a free place in the usbdux array */
@@ -2360,8 +2356,8 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
up(&start_stop_sem);
return -EMFILE;
}
- dev_dbg(dev, "comedi_: usbdux: "
- "usbduxsub[%d] is ready to connect to comedi.\n", index);
+ dev_dbg(dev, "comedi_: usbduxsub[%d] is ready to connect to comedi.\n",
+ index);
sema_init(&(usbduxsub[index].sem), 1);
/* save a pointer to the usb device */
@@ -2384,8 +2380,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
/* create space for the commands of the DA converter */
usbduxsub[index].dac_commands = kzalloc(NUMOUTCHANNELS, GFP_KERNEL);
if (!usbduxsub[index].dac_commands) {
- dev_err(dev, "comedi_: usbdux: "
- "error alloc space for dac commands\n");
+ dev_err(dev, "comedi_: error alloc space for dac commands\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2393,8 +2388,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
/* create space for the commands going to the usb device */
usbduxsub[index].dux_commands = kzalloc(SIZEOFDUXBUFFER, GFP_KERNEL);
if (!usbduxsub[index].dux_commands) {
- dev_err(dev, "comedi_: usbdux: "
- "error alloc space for dux commands\n");
+ dev_err(dev, "comedi_: error alloc space for dux commands\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2402,8 +2396,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
/* create space for the in buffer and set it to zero */
usbduxsub[index].inBuffer = kzalloc(SIZEINBUF, GFP_KERNEL);
if (!(usbduxsub[index].inBuffer)) {
- dev_err(dev, "comedi_: usbdux: "
- "could not alloc space for inBuffer\n");
+ dev_err(dev, "comedi_: could not alloc space for inBuffer\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2411,8 +2404,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
/* create space of the instruction buffer */
usbduxsub[index].insnBuffer = kzalloc(SIZEINSNBUF, GFP_KERNEL);
if (!(usbduxsub[index].insnBuffer)) {
- dev_err(dev, "comedi_: usbdux: "
- "could not alloc space for insnBuffer\n");
+ dev_err(dev, "comedi_: could not alloc space for insnBuffer\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2420,8 +2412,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
/* create space for the outbuffer */
usbduxsub[index].outBuffer = kzalloc(SIZEOUTBUF, GFP_KERNEL);
if (!(usbduxsub[index].outBuffer)) {
- dev_err(dev, "comedi_: usbdux: "
- "could not alloc space for outBuffer\n");
+ dev_err(dev, "comedi_: could not alloc space for outBuffer\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 19/25] Staging: comedi: Checkpatch cleanups.
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (17 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 18/25] Staging: comedi: Checkpatch cleanups Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 20/25] " Ravishankar Karkala Mallikarjunayya
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
drivers/staging/comedi/drivers/usbdux.c:2425: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2450: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2466: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2489: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2499: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2515: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2542: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2551: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbdux.c:2583: WARNING: quoted string split across lines
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbdux.c | 34 ++++++++++++++----------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index bd71671..3297491 100644
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -2421,8 +2421,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
i = usb_set_interface(usbduxsub[index].usbdev,
usbduxsub[index].ifnum, 3);
if (i < 0) {
- dev_err(dev, "comedi_: usbdux%d: "
- "could not set alternate setting 3 in high speed.\n",
+ dev_err(dev, "comedi_: usbdux%d: could not set alternate setting 3 in high speed.\n",
index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
@@ -2446,8 +2445,8 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
/* one frame: 1ms */
usbduxsub[index].urbIn[i] = usb_alloc_urb(1, GFP_KERNEL);
if (usbduxsub[index].urbIn[i] == NULL) {
- dev_err(dev, "comedi_: usbdux%d: "
- "Could not alloc. urb(%d)\n", index, i);
+ dev_err(dev, "comedi_: usbdux%d: Could not alloc. urb(%d)\n",
+ index, i);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2462,8 +2461,8 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
usbduxsub[index].urbIn[i]->transfer_buffer =
kzalloc(SIZEINBUF, GFP_KERNEL);
if (!(usbduxsub[index].urbIn[i]->transfer_buffer)) {
- dev_err(dev, "comedi_: usbdux%d: "
- "could not alloc. transb.\n", index);
+ dev_err(dev, "comedi_: usbdux%d: could not alloc. transb.\n",
+ index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2485,8 +2484,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
kzalloc(sizeof(struct urb *) * usbduxsub[index].numOfOutBuffers,
GFP_KERNEL);
if (!(usbduxsub[index].urbOut)) {
- dev_err(dev, "comedi_: usbdux: "
- "Could not alloc. urbOut array\n");
+ dev_err(dev, "comedi_: Could not alloc. urbOut array\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2495,8 +2493,8 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
/* one frame: 1ms */
usbduxsub[index].urbOut[i] = usb_alloc_urb(1, GFP_KERNEL);
if (usbduxsub[index].urbOut[i] == NULL) {
- dev_err(dev, "comedi_: usbdux%d: "
- "Could not alloc. urb(%d)\n", index, i);
+ dev_err(dev, "comedi_: usbdux%d: Could not alloc. urb(%d)\n",
+ index, i);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2511,8 +2509,8 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
usbduxsub[index].urbOut[i]->transfer_buffer =
kzalloc(SIZEOUTBUF, GFP_KERNEL);
if (!(usbduxsub[index].urbOut[i]->transfer_buffer)) {
- dev_err(dev, "comedi_: usbdux%d: "
- "could not alloc. transb.\n", index);
+ dev_err(dev, "comedi_: usbdux%d: could not alloc. transb.\n",
+ index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2538,8 +2536,8 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
usbduxsub[index].sizePwmBuf = 512;
usbduxsub[index].urbPwm = usb_alloc_urb(0, GFP_KERNEL);
if (usbduxsub[index].urbPwm == NULL) {
- dev_err(dev, "comedi_: usbdux%d: "
- "Could not alloc. pwm urb\n", index);
+ dev_err(dev, "comedi_: usbdux%d: Could not alloc. pwm urb\n",
+ index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2547,8 +2545,8 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
usbduxsub[index].urbPwm->transfer_buffer =
kzalloc(usbduxsub[index].sizePwmBuf, GFP_KERNEL);
if (!(usbduxsub[index].urbPwm->transfer_buffer)) {
- dev_err(dev, "comedi_: usbdux%d: "
- "could not alloc. transb. for pwm\n", index);
+ dev_err(dev, "comedi_: usbdux%d: could not alloc. transb. for pwm\n",
+ index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2579,8 +2577,8 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
return ret;
}
- dev_info(dev, "comedi_: usbdux%d "
- "has been successfully initialised.\n", index);
+ dev_info(dev, "comedi_: usbdux%d has been successfully initialised.\n",
+ index);
/* success */
return 0;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 20/25] Staging: comedi: Checkpatch cleanups.
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (18 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 19/25] " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 21/25] Staging: comedi: fix printk issue in pcmmio.c Ravishankar Karkala Mallikarjunayya
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
drivers/staging/comedi/drivers/usbduxsigma.c:1085: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbduxsigma.c:1105: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbduxsigma.c:1117: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbduxsigma.c:1193: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbduxsigma.c:1255: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbduxsigma.c:1687: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbduxsigma.c:2353: WARNING: quoted string split across lines
drivers/staging/comedi/drivers/usbduxsigma.c:2372: WARNING: quoted string split across lines
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/usbduxsigma.c | 102 +++++++++++---------------
1 files changed, 44 insertions(+), 58 deletions(-)
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index f21bb0d..83e1669 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -1081,9 +1081,9 @@ static int send_dux_commands(struct usbduxsub *this_usbduxsub, int cmd_type)
this_usbduxsub->dux_commands, SIZEOFDUXBUFFER,
&nsent, BULK_TIMEOUT);
if (result < 0)
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
- "could not transmit dux_command to the usb-device, "
- "err=%d\n", this_usbduxsub->comedidev->minor, result);
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: could not transmit dux_command to the usb-device, err=%d\n",
+ this_usbduxsub->comedidev->minor, result);
return result;
}
@@ -1101,11 +1101,9 @@ static int receive_dux_commands(struct usbduxsub *this_usbduxsub, int command)
this_usbduxsub->insnBuffer, SIZEINSNBUF,
&nrec, BULK_TIMEOUT);
if (result < 0) {
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
- "insn: USB error %d "
- "while receiving DUX command"
- "\n", this_usbduxsub->comedidev->minor,
- result);
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: insn: USB error %d while receiving DUX command\n",
+ this_usbduxsub->comedidev->minor, result);
return result;
}
if (this_usbduxsub->insnBuffer[0] == command)
@@ -1113,8 +1111,8 @@ static int receive_dux_commands(struct usbduxsub *this_usbduxsub, int command)
}
/* this is only reached if the data has been requested a couple of
* times */
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: insn: "
- "wrong data returned from firmware: want %d, got %d.\n",
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: insn: wrong data returned from firmware: want %d, got %d.\n",
this_usbduxsub->comedidev->minor, command,
this_usbduxsub->insnBuffer[0]);
return -EFAULT;
@@ -1189,8 +1187,8 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
return -ENODEV;
}
if (this_usbduxsub->ai_cmd_running) {
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: "
- "ai_cmd not possible. Another ai_cmd is running.\n",
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: ai_cmd not possible. Another ai_cmd is running.\n",
dev->minor);
up(&this_usbduxsub->sem);
return -EBUSY;
@@ -1251,10 +1249,10 @@ static int usbdux_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
this_usbduxsub->ai_timer = cmd->scan_begin_arg / 1000000;
}
if (this_usbduxsub->ai_timer < 1) {
- dev_err(&this_usbduxsub->interface->dev, "comedi%d: ai_cmd: "
- "timer=%d, scan_begin_arg=%d. "
- "Not properly tested by cmdtest?\n", dev->minor,
- this_usbduxsub->ai_timer, cmd->scan_begin_arg);
+ dev_err(&this_usbduxsub->interface->dev,
+ "comedi%d: ai_cmd: timer=%d, scan_begin_arg=%d. Not properly tested by cmdtest?\n",
+ dev->minor, this_usbduxsub->ai_timer,
+ cmd->scan_begin_arg);
up(&this_usbduxsub->sem);
return -EINVAL;
}
@@ -1683,10 +1681,10 @@ static int usbdux_ao_cmdtest(struct comedi_device *dev,
}
}
- dev_dbg(&this_usbduxsub->interface->dev, "comedi%d: err=%d, "
- "scan_begin_src=%d, scan_begin_arg=%d, convert_src=%d, "
- "convert_arg=%d\n", dev->minor, err, cmd->scan_begin_src,
- cmd->scan_begin_arg, cmd->convert_src, cmd->convert_arg);
+ dev_dbg(&this_usbduxsub->interface->dev,
+ "comedi%d: err=%d, scan_begin_src=%d, scan_begin_arg=%d, convert_src=%d, convert_arg=%d\n",
+ dev->minor, err, cmd->scan_begin_src, cmd->scan_begin_arg,
+ cmd->convert_src, cmd->convert_arg);
if (err)
return 3;
@@ -1740,18 +1738,15 @@ static int usbdux_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
/* timing of the scan: we get all channels at once */
this_usbduxsub->ao_timer = cmd->scan_begin_arg / 1000000;
dev_dbg(&this_usbduxsub->interface->dev,
- "comedi%d: scan_begin_src=%d, scan_begin_arg=%d, "
- "convert_src=%d, convert_arg=%d\n", dev->minor,
- cmd->scan_begin_src, cmd->scan_begin_arg,
+ "comedi%d: scan_begin_src=%d, scan_begin_arg=%d, convert_src=%d, convert_arg=%d\n",
+ dev->minor, cmd->scan_begin_src, cmd->scan_begin_arg,
cmd->convert_src, cmd->convert_arg);
dev_dbg(&this_usbduxsub->interface->dev,
"comedi%d: ao_timer=%d (ms)\n",
dev->minor, this_usbduxsub->ao_timer);
if (this_usbduxsub->ao_timer < 1) {
dev_err(&this_usbduxsub->interface->dev,
- "comedi%d: usbdux: ao_timer=%d, "
- "scan_begin_arg=%d. "
- "Not properly tested by cmdtest?\n",
+ "comedi%d: ao_timer=%d, scan_begin_arg=%d. Not properly tested by cmdtest?\n",
dev->minor, this_usbduxsub->ao_timer,
cmd->scan_begin_arg);
up(&this_usbduxsub->sem);
@@ -2349,8 +2344,7 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
int index;
int ret;
- dev_dbg(dev, "comedi_: usbdux_: "
- "finding a free structure for the usb-device\n");
+ dev_dbg(dev, "comedi_: finding a free structure for the usb-device\n");
down(&start_stop_sem);
/* look for a free place in the usbdux array */
@@ -2368,8 +2362,8 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
up(&start_stop_sem);
return -EMFILE;
}
- dev_dbg(dev, "comedi_: usbdux: "
- "usbduxsub[%d] is ready to connect to comedi.\n", index);
+ dev_dbg(dev, "comedi_: usbduxsub[%d] is ready to connect to comedi.\n",
+ index);
sema_init(&(usbduxsub[index].sem), 1);
/* save a pointer to the usb device */
@@ -2392,8 +2386,7 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
/* create space for the commands of the DA converter */
usbduxsub[index].dac_commands = kzalloc(NUMOUTCHANNELS, GFP_KERNEL);
if (!usbduxsub[index].dac_commands) {
- dev_err(dev, "comedi_: usbduxsigma: "
- "error alloc space for dac commands\n");
+ dev_err(dev, "comedi_: error alloc space for dac commands\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2401,8 +2394,7 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
/* create space for the commands going to the usb device */
usbduxsub[index].dux_commands = kzalloc(SIZEOFDUXBUFFER, GFP_KERNEL);
if (!usbduxsub[index].dux_commands) {
- dev_err(dev, "comedi_: usbduxsigma: "
- "error alloc space for dux commands\n");
+ dev_err(dev, "comedi_: error alloc space for dux commands\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2410,8 +2402,7 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
/* create space for the in buffer and set it to zero */
usbduxsub[index].inBuffer = kzalloc(SIZEINBUF, GFP_KERNEL);
if (!(usbduxsub[index].inBuffer)) {
- dev_err(dev, "comedi_: usbduxsigma: "
- "could not alloc space for inBuffer\n");
+ dev_err(dev, "comedi_: could not alloc space for inBuffer\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2419,8 +2410,7 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
/* create space of the instruction buffer */
usbduxsub[index].insnBuffer = kzalloc(SIZEINSNBUF, GFP_KERNEL);
if (!(usbduxsub[index].insnBuffer)) {
- dev_err(dev, "comedi_: usbduxsigma: "
- "could not alloc space for insnBuffer\n");
+ dev_err(dev, "comedi_: could not alloc space for insnBuffer\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2428,8 +2418,7 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
/* create space for the outbuffer */
usbduxsub[index].outBuffer = kzalloc(SIZEOUTBUF, GFP_KERNEL);
if (!(usbduxsub[index].outBuffer)) {
- dev_err(dev, "comedi_: usbduxsigma: "
- "could not alloc space for outBuffer\n");
+ dev_err(dev, "comedi_: could not alloc space for outBuffer\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2438,8 +2427,7 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
i = usb_set_interface(usbduxsub[index].usbdev,
usbduxsub[index].ifnum, 3);
if (i < 0) {
- dev_err(dev, "comedi_: usbduxsigma%d: "
- "could not set alternate setting 3 in high speed.\n",
+ dev_err(dev, "comedi_: usbduxsigma%d: could not set alternate setting 3 in high speed.\n",
index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
@@ -2454,8 +2442,7 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
kzalloc(sizeof(struct urb *) * usbduxsub[index].numOfInBuffers,
GFP_KERNEL);
if (!(usbduxsub[index].urbIn)) {
- dev_err(dev, "comedi_: usbduxsigma: "
- "Could not alloc. urbIn array\n");
+ dev_err(dev, "comedi_: Could not alloc. urbIn array\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2464,8 +2451,8 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
/* one frame: 1ms */
usbduxsub[index].urbIn[i] = usb_alloc_urb(1, GFP_KERNEL);
if (usbduxsub[index].urbIn[i] == NULL) {
- dev_err(dev, "comedi_: usbduxsigma%d: "
- "Could not alloc. urb(%d)\n", index, i);
+ dev_err(dev, "comedi_: usbduxsigma%d: Could not alloc. urb(%d)\n",
+ index, i);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2480,8 +2467,8 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
usbduxsub[index].urbIn[i]->transfer_buffer =
kzalloc(SIZEINBUF, GFP_KERNEL);
if (!(usbduxsub[index].urbIn[i]->transfer_buffer)) {
- dev_err(dev, "comedi_: usbduxsigma%d: "
- "could not alloc. transb.\n", index);
+ dev_err(dev, "comedi_: usbduxsigma%d: could not alloc. transb.\n",
+ index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2504,8 +2491,7 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
kzalloc(sizeof(struct urb *) * usbduxsub[index].numOfOutBuffers,
GFP_KERNEL);
if (!(usbduxsub[index].urbOut)) {
- dev_err(dev, "comedi_: usbduxsigma: "
- "Could not alloc. urbOut array\n");
+ dev_err(dev, "comedi_: Could not alloc. urbOut array\n");
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2514,8 +2500,8 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
/* one frame: 1ms */
usbduxsub[index].urbOut[i] = usb_alloc_urb(1, GFP_KERNEL);
if (usbduxsub[index].urbOut[i] == NULL) {
- dev_err(dev, "comedi_: usbduxsigma%d: "
- "Could not alloc. urb(%d)\n", index, i);
+ dev_err(dev, "comedi_: usbduxsigma%d: Could not alloc. urb(%d)\n",
+ index, i);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2530,8 +2516,8 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
usbduxsub[index].urbOut[i]->transfer_buffer =
kzalloc(SIZEOUTBUF, GFP_KERNEL);
if (!(usbduxsub[index].urbOut[i]->transfer_buffer)) {
- dev_err(dev, "comedi_: usbduxsigma%d: "
- "could not alloc. transb.\n", index);
+ dev_err(dev, "comedi_: usbduxsigma%d: could not alloc. transb.\n",
+ index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2558,8 +2544,8 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
usbduxsub[index].sizePwmBuf = 512;
usbduxsub[index].urbPwm = usb_alloc_urb(0, GFP_KERNEL);
if (usbduxsub[index].urbPwm == NULL) {
- dev_err(dev, "comedi_: usbduxsigma%d: "
- "Could not alloc. pwm urb\n", index);
+ dev_err(dev, "comedi_: usbduxsigma%d: Could not alloc. pwm urb\n",
+ index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
@@ -2567,8 +2553,8 @@ static int usbduxsigma_probe(struct usb_interface *uinterf,
usbduxsub[index].urbPwm->transfer_buffer =
kzalloc(usbduxsub[index].sizePwmBuf, GFP_KERNEL);
if (!(usbduxsub[index].urbPwm->transfer_buffer)) {
- dev_err(dev, "comedi_: usbduxsigma%d: "
- "could not alloc. transb. for pwm\n", index);
+ dev_err(dev, "comedi_: usbduxsigma%d: could not alloc. transb. for pwm\n",
+ index);
tidy_up(&(usbduxsub[index]));
up(&start_stop_sem);
return -ENOMEM;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 21/25] Staging: comedi: fix printk issue in pcmmio.c.
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (19 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 20/25] " Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 22/25] Staging: comedi: fix printk issue in pcmad.c Ravishankar Karkala Mallikarjunayya
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the pcmmio.c that fixes up printk warning
found by the checkpatch.pl tool.
Used dev_<level> function instead of printks.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/pcmmio.c | 34 ++++++++++++++++--------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index 9ee1da5..498527a 100644
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -1021,15 +1021,16 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iobase = it->options[0];
irq[0] = it->options[1];
- printk(KERN_INFO "comedi%d: %s: io: %lx attaching...\n", dev->minor,
- dev->driver->driver_name, iobase);
+ dev_info(dev->hw_dev, "comedi%d: %s: io: %lx attaching...\n",
+ dev->minor, dev->driver->driver_name, iobase);
dev->iobase = iobase;
if (!iobase || !request_region(iobase,
thisboard->total_iosize,
dev->driver->driver_name)) {
- printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: I/O port conflict\n",
+ dev->minor);
return -EIO;
}
@@ -1044,8 +1045,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* convenient macro defined in comedidev.h.
*/
if (alloc_private(dev, sizeof(struct pcmmio_private)) < 0) {
- printk(KERN_ERR "comedi%d: cannot allocate private data structure\n",
- dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: cannot allocate private data structure\n",
+ dev->minor);
return -ENOMEM;
}
@@ -1068,8 +1069,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
kcalloc(n_subdevs, sizeof(struct pcmmio_subdev_private),
GFP_KERNEL);
if (!devpriv->sprivs) {
- printk(KERN_ERR "comedi%d: cannot allocate subdevice private data structures\n",
- dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: cannot allocate subdevice private data structures\n",
+ dev->minor);
return -ENOMEM;
}
/*
@@ -1079,8 +1080,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* Allocate 1 AI + 1 AO + 2 DIO subdevs (24 lines per DIO)
*/
if (alloc_subdevices(dev, n_subdevs) < 0) {
- printk(KERN_ERR "comedi%d: cannot allocate subdevice data structures\n",
- dev->minor);
+ dev_err(dev->hw_dev, "comedi%d: cannot allocate subdevice data structures\n",
+ dev->minor);
return -ENOMEM;
}
@@ -1210,15 +1211,16 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
*/
if (irq[0]) {
- printk(KERN_DEBUG "comedi%d: irq: %u\n", dev->minor, irq[0]);
+ dev_dbg(dev->hw_dev, "comedi%d: irq: %u\n", dev->minor, irq[0]);
if (thisboard->dio_num_asics == 2 && irq[1])
- printk(KERN_DEBUG "comedi%d: second ASIC irq: %u\n",
- dev->minor, irq[1]);
+ dev_dbg(dev->hw_dev, "comedi%d: second ASIC irq: %u\n",
+ dev->minor, irq[1]);
} else {
- printk(KERN_INFO "comedi%d: (IRQ mode disabled)\n", dev->minor);
+ dev_info(dev->hw_dev, "comedi%d: (IRQ mode disabled)\n",
+ dev->minor);
}
- printk(KERN_INFO "comedi%d: attached\n", dev->minor);
+ dev_info(dev->hw_dev, "comedi%d: attached\n", dev->minor);
return 1;
}
@@ -1227,8 +1229,8 @@ static int pcmmio_detach(struct comedi_device *dev)
{
int i;
- printk(KERN_INFO "comedi%d: %s: remove\n", dev->minor,
- dev->driver->driver_name);
+ dev_info(dev->hw_dev, "comedi%d: %s: remove\n", dev->minor,
+ dev->driver->driver_name);
if (dev->iobase)
release_region(dev->iobase, thisboard->total_iosize);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 22/25] Staging: comedi: fix printk issue in pcmad.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (20 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 21/25] Staging: comedi: fix printk issue in pcmmio.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 23/25] Staging: comedi: fix printk issue in poc.c Ravishankar Karkala Mallikarjunayya
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the pcmad.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<levels> function.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/pcmad.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index fe8ef66..c974523 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -109,12 +109,11 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned long iobase;
iobase = it->options[0];
- printk(KERN_INFO "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
+ dev_info(dev->hw_dev, "comedi%d: 0x%04lx\n", dev->minor, iobase);
if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {
- printk(KERN_CONT "I/O port conflict\n");
+ dev_err(dev->hw_dev, "I/O port conflict\n");
return -EIO;
}
- printk(KERN_CONT "\n");
dev->iobase = iobase;
ret = alloc_subdevices(dev, 1);
@@ -141,7 +140,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static int pcmad_detach(struct comedi_device *dev)
{
- printk(KERN_INFO "comedi%d: pcmad: remove\n", dev->minor);
+ dev_info(dev->hw_dev, "comedi%d: remove\n", dev->minor);
if (dev->irq)
free_irq(dev->irq, dev);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 23/25] Staging: comedi: fix printk issue in poc.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (21 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 22/25] Staging: comedi: fix printk issue in pcmad.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 24/25] Staging: comedi: fix printk issue in ni_pcimio.c Ravishankar Karkala Mallikarjunayya
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the poc.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<level> function.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/poc.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c
index e3690bb..a55b877 100644
--- a/drivers/staging/comedi/drivers/poc.c
+++ b/drivers/staging/comedi/drivers/poc.c
@@ -142,21 +142,22 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
unsigned int iosize;
iobase = it->options[0];
- printk(KERN_INFO "comedi%d: poc: using %s iobase 0x%lx\n", dev->minor,
- this_board->name, iobase);
+ dev_info(dev->hw_dev, "comedi%d: poc: using %s iobase 0x%lx\n",
+ dev->minor, this_board->name, iobase);
dev->board_name = this_board->name;
if (iobase == 0) {
- printk(KERN_ERR "io base address required\n");
+ dev_err(dev->hw_dev, "io base address required\n");
return -EINVAL;
}
iosize = this_board->iosize;
/* check if io addresses are available */
if (!request_region(iobase, iosize, "dac02")) {
- printk(KERN_ERR "I/O port conflict: failed to allocate ports "
- "0x%lx to 0x%lx\n", iobase, iobase + iosize - 1);
+ dev_err(dev->hw_dev,
+ "I/O port conflict: failed to allocate ports 0x%lx to 0x%lx\n",
+ iobase, iobase + iosize - 1);
return -EIO;
}
dev->iobase = iobase;
@@ -187,7 +188,7 @@ static int poc_detach(struct comedi_device *dev)
if (dev->iobase)
release_region(dev->iobase, this_board->iosize);
- printk(KERN_INFO "comedi%d: dac02: remove\n", dev->minor);
+ dev_info(dev->hw_dev, "comedi%d: remove\n", dev->minor);
return 0;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 24/25] Staging: comedi: fix printk issue in ni_pcimio.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (22 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 23/25] Staging: comedi: fix printk issue in poc.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-11 10:38 ` [PATCH 25/25] Staging: comedi: fix printk issue in ni_660x.c Ravishankar Karkala Mallikarjunayya
2012-05-14 20:53 ` Staging: comedi: Clean up patch series Greg KH
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the pcimio.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to dev_<level> function.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/ni_pcimio.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 1065b2c..9fd9c3c 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1491,8 +1491,8 @@ static void m_series_stc_writew(struct comedi_device *dev, uint16_t data,
/* FIXME: DIO_Output_Register (16 bit reg) is replaced by M_Offset_Static_Digital_Output (32 bit)
and M_Offset_SCXI_Serial_Data_Out (8 bit) */
default:
- printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
- __func__, reg);
+ dev_warn(dev->hw_dev, "%s: bug! unhandled register=0x%x in switch.\n",
+ __func__, reg);
BUG();
return;
break;
@@ -1526,8 +1526,8 @@ static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg)
offset = M_Offset_G01_Status;
break;
default:
- printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
- __func__, reg);
+ dev_warn(dev->hw_dev, "%s: bug! unhandled register=0x%x in switch.\n",
+ __func__, reg);
BUG();
return 0;
break;
@@ -1568,8 +1568,8 @@ static void m_series_stc_writel(struct comedi_device *dev, uint32_t data,
offset = M_Offset_G1_Load_B;
break;
default:
- printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
- __func__, reg);
+ dev_warn(dev->hw_dev, "%s: bug! unhandled register=0x%x in switch.\n",
+ __func__, reg);
BUG();
return;
break;
@@ -1594,8 +1594,8 @@ static uint32_t m_series_stc_readl(struct comedi_device *dev, int reg)
offset = M_Offset_G1_Save;
break;
default:
- printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
- __func__, reg);
+ dev_warn(dev->hw_dev, "%s: bug! unhandled register=0x%x in switch.\n",
+ __func__, reg);
BUG();
return 0;
break;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 25/25] Staging: comedi: fix printk issue in ni_660x.c
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (23 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 24/25] Staging: comedi: fix printk issue in ni_pcimio.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-11 10:38 ` Ravishankar Karkala Mallikarjunayya
2012-05-14 20:53 ` Staging: comedi: Clean up patch series Greg KH
25 siblings, 0 replies; 27+ messages in thread
From: Ravishankar Karkala Mallikarjunayya @ 2012-05-11 10:38 UTC (permalink / raw)
To: gregkh, wfp5p; +Cc: devel, linux-kernel, Ravishankar Karkala Mallikarjunayya
This is a patch to the ni_660x.c file that fixes up a
printk warning found by the checkpatch.pl tool.
Converted printks to pr_<level> and dev_<level>
function wherver possible.
Signed-off-by: Ravishankar Karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
---
drivers/staging/comedi/drivers/ni_660x.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index eea7047..8568ea8 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -748,8 +748,8 @@ static enum NI_660x_Register ni_gpct_to_660x_register(enum ni_gpct_register reg)
ni_660x_register = G3InterruptEnable;
break;
default:
- printk(KERN_WARNING "%s: unhandled register 0x%x in switch.\n",
- __func__, reg);
+ pr_warn("%s: unhandled register 0x%x in switch.\n",
+ __func__, reg);
BUG();
return 0;
break;
@@ -773,8 +773,8 @@ static inline void ni_660x_write_register(struct comedi_device *dev,
writel(bits, write_address);
break;
default:
- printk(KERN_WARNING "%s: %s: bug! unhandled case (reg=0x%x) in switch.\n",
- __FILE__, __func__, reg);
+ dev_warn(dev->hw_dev, "%s: %s: bug! unhandled case (reg=0x%x) in switch.\n",
+ __FILE__, __func__, reg);
BUG();
break;
}
@@ -796,8 +796,8 @@ static inline unsigned ni_660x_read_register(struct comedi_device *dev,
return readl(read_address);
break;
default:
- printk(KERN_WARNING "%s: %s: bug! unhandled case (reg=0x%x) in switch.\n",
- __FILE__, __func__, reg);
+ dev_warn(dev->hw_dev, "%s: %s: bug! unhandled case (reg=0x%x) in switch.\n",
+ __FILE__, __func__, reg);
BUG();
break;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: Staging: comedi: Clean up patch series.
2012-05-11 10:37 Staging: comedi: Clean up patch series Ravishankar Karkala Mallikarjunayya
` (24 preceding siblings ...)
2012-05-11 10:38 ` [PATCH 25/25] Staging: comedi: fix printk issue in ni_660x.c Ravishankar Karkala Mallikarjunayya
@ 2012-05-14 20:53 ` Greg KH
25 siblings, 0 replies; 27+ messages in thread
From: Greg KH @ 2012-05-14 20:53 UTC (permalink / raw)
To: Ravishankar Karkala Mallikarjunayya; +Cc: wfp5p, devel, linux-kernel
On Fri, May 11, 2012 at 04:07:48PM +0530, Ravishankar Karkala Mallikarjunayya wrote:
> This patch series fixes some style issues in drivers/staging/comedi/drivers
> and fix some issues found by checkpatch.pl script.
>
> Ravishankar Karkala Mallikarjunayya (25):
> Staging: comedi: fix printk issue in usbduxfast.c
> Staging: comedi: fix printk issues in usbduxfast.c
> Staging: comedi: fix printk issue in usbduxfast.c
> Staging: comedi: fix printk issue in usbduxfast.c
> Staging: comedi: fix printk issue in usbduxfast.c
> Staging: comedi: fix printk issue in usbduxfast.c
> Staging: comedi: fix printk issues in usbduxfast.c
> Staging: comedi: fix printk issue in rti800.c
> Staging: comedi: fix printk issue in rti802.c
> Staging: comedi: fix printk issue in s526.c
> Staging: comedi: fix printk issue in s626.c
> Staging: comedi: Checkpatch cleanups.
> Staging: comedi: Checkpatch cleanups.
> Staging: comedi: fix printk issue in serial2002.c
> Staging: comedi: fix printk issue in unioxx5.c
> Staging: comedi: fix printk issues in unioxx5.c
> Staging: comedi: fix line over 80 character issue in unioxx5.c
> Staging: comedi: Checkpatch cleanups.
> Staging: comedi: Checkpatch cleanups.
> Staging: comedi: Checkpatch cleanups.
> Staging: comedi: fix printk issue in pcmmio.c.
> Staging: comedi: fix printk issue in pcmad.c
> Staging: comedi: fix printk issue in poc.c
> Staging: comedi: fix printk issue in ni_pcimio.c
> Staging: comedi: fix printk issue in ni_660x.c
You have lots of duplicated Subject: lines in here, that are not
descriptive at all. You also do much the same exact thing in the same
exact files, yet you split it up into different patches for no apparent
reason at all.
Please rework this series to make one "logic" change per file, and make
better subject: lines that are understandable, I can't take any of these
as-is, sorry.
greg k-h
^ permalink raw reply [flat|nested] 27+ messages in thread