From: Conrad Gomes Date: Thu, 21 Nov 2013 19:57:56 +0000 (+0530) Subject: Staging: comedi: change pr_err to dev_err in __unioxx5_digital_write X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=10394e57629f55f37e577fa6d515be3e5351dc6f;p=linux-beck.git Staging: comedi: change pr_err to dev_err in __unioxx5_digital_write This is a patch which subsitutes pr_err with the preferred dev_err for device drivers in __unioxx5_digital_write. The function definition of __unioxx5_digital_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_digital_write in unioxx5_subdev_write has been changed to pass the pointer to the struct comedi_subdevice Signed-off-by: Conrad Gomes Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c index 7edbd5e97731..343ba9673e88 100644 --- a/drivers/staging/comedi/drivers/unioxx5.c +++ b/drivers/staging/comedi/drivers/unioxx5.c @@ -205,15 +205,17 @@ static int __unioxx5_analog_read(struct comedi_subdevice *s, return 1; } -static int __unioxx5_digital_write(struct unioxx5_subd_priv *usp, +static int __unioxx5_digital_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 channel_offset, val; int mask = 1 << (channel & 0x07); channel_offset = __unioxx5_define_chan_offset(channel); if (channel_offset < 0) { - pr_err("comedi%d: undefined channel %d. channel range is 0 .. 23\n", + dev_err(csdev, "comedi%d: undefined channel %d. channel range is 0 .. 23\n", minor, channel); return 0; } @@ -303,7 +305,7 @@ static int unioxx5_subdev_write(struct comedi_device *dev, type = usp->usp_module_type[channel / 2]; if (type == MODULE_DIGITAL) { - if (!__unioxx5_digital_write(usp, data, channel, dev->minor)) + if (!__unioxx5_digital_write(subdev, data, channel, dev->minor)) return -1; } else { if (!__unioxx5_analog_write(usp, data, channel, dev->minor))