Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: unionxx5: tidy up some dev_{level} messages

Browse Source 
Remove the "comedi%d:" prefix from the dev_{level} messages. This previx
will already be displayed.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-11-26 10:21:36 -07:00 committed by Greg Kroah-Hartman
parent d8e1f9619b
commit 931cf48d2d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/comedi/drivers/unioxx5.c
View File

@ -146,8 +146,8 @@ static int __unioxx5_digital_read(struct comedi_subdevice *s,
channel_offset = __unioxx5_define_chan_offset(channel);
if (channel_offset < 0) {
dev_err(csdev,
"comedi%d: undefined channel %d. channel range is 0 .. 23\n",
minor, channel);
"undefined channel %d. channel range is 0 .. 23\n",
channel);
return 0;
}
@ -174,8 +174,9 @@ static int __unioxx5_analog_read(struct comedi_subdevice *s,
/* defining if given module can work on input */
if (usp->usp_module_type[module_no] & MODULE_OUTPUT_MASK) {
dev_err(csdev, "comedi%d: module in position %d with id 0x%02x is for output only",
minor, module_no, usp->usp_module_type[module_no]);
dev_err(csdev,
"module in position %d with id 0x%02x is for output only",
module_no, usp->usp_module_type[module_no]);
return 0;
}
@ -191,8 +192,7 @@ static int __unioxx5_analog_read(struct comedi_subdevice *s,
/* if four bytes readding error occurs - return 0(false) */
if ((control & Rx4CA_ERR_MASK)) {
dev_err(csdev,
"comedi%d: 4 bytes error\n", minor);
dev_err(csdev, "4 bytes error\n");
return 0;
}
@ -214,8 +214,9 @@ static int __unioxx5_digital_write(struct comedi_subdevice *s,
channel_offset = __unioxx5_define_chan_offset(channel);
if (channel_offset < 0) {
dev_err(csdev, "comedi%d: undefined channel %d. channel range is 0 .. 23\n",
minor, channel);
dev_err(csdev,
"undefined channel %d. channel range is 0 .. 23\n",
channel);
return 0;
}
@ -246,8 +247,9 @@ static int __unioxx5_analog_write(struct comedi_subdevice *s,
/* defining if given module can work on output */
if (!(usp->usp_module_type[module] & MODULE_OUTPUT_MASK)) {
dev_err(csdev, "comedi%d: module in position %d with id 0x%0x is for input only!\n",
minor, module, usp->usp_module_type[module]);
dev_err(csdev,
"module in position %d with id 0x%0x is for input only!\n",
module, usp->usp_module_type[module]);
return 0;
}
@ -329,16 +331,15 @@ static int unioxx5_insn_config(struct comedi_device *dev,
if (type != MODULE_DIGITAL) {
dev_err(dev->class_dev,
"comedi%d: channel configuration accessible only for digital modules\n",
dev->minor);
"channel configuration accessible only for digital modules\n");
return -1;
}
channel_offset = __unioxx5_define_chan_offset(channel);
if (channel_offset < 0) {
dev_err(dev->class_dev,
"comedi%d: undefined channel %d. channel range is 0 .. 23\n",
dev->minor, channel);
"undefined channel %d. channel range is 0 .. 23\n",
channel);
return -1;
}
@ -353,8 +354,7 @@ static int unioxx5_insn_config(struct comedi_device *dev,
flags |= mask;
break;
default:
dev_err(dev->class_dev,
"comedi%d: unknown flag\n", dev->minor);
dev_err(dev->class_dev, "unknown flag\n");
return -1;
}