iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: comedi: change pr_err to dev_err in __unioxx5_analog_write

Browse Source 
This is a patch which subsitutes pr_err with the preferred dev_err
for device drivers in __unioxx5_analog_write.

The function definition of __unioxx5_analog_write has been changed
to take the pointer to the struct comedi_subdevice as a parameter
instead of the pointer to struct unioxx5_subd_priv.

The pointers to the stuct device and the struct unioxx5_subd_priv are
obtained through the pointer to the struct comedi_subdevice in this
function.

The function call to __unioxx5_analog_write in unioxx5_subdev_write
has been changed to pass the pointer to the struct comedi_subdevice

Signed-off-by: Conrad Gomes <conrad.s.j.gomes@gmail.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Conrad Gomes 2013-11-22 01:27:57 +05:30 committed by Greg Kroah-Hartman
parent 10394e5762
commit c29d9a8816
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,9 +235,11 @@ static int __unioxx5_digital_write(struct comedi_subdevice *s,
return 1;
}
static int __unioxx5_analog_write(struct unioxx5_subd_priv *usp,
static int __unioxx5_analog_write(struct comedi_subdevice *s,
unsigned int *data, int channel, int minor)
{
struct unioxx5_subd_priv *usp = s->private;
struct device *csdev = s->device->class_dev;
int module, i;
module = channel / 2; /* definig module number(0 .. 11) */
@ -245,7 +247,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)) {
pr_err("comedi%d: module in position %d with id 0x%0x is for input only!\n",
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]);
return 0;
}
@ -308,7 +310,7 @@ static int unioxx5_subdev_write(struct comedi_device *dev,
if (!__unioxx5_digital_write(subdev, data, channel, dev->minor))
return -1;
} else {
if (!__unioxx5_analog_write(usp, data, channel, dev->minor))
if (!__unioxx5_analog_write(subdev, data, channel, dev->minor))
return -1;
}