From: Conrad Gomes <conrad.s.j.gomes@gmail.com>
To: abbotti@mev.co.uk, hsweeten@visionengravers.com,
gregkh@linuxfoundation.org, joe@perches.com
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Conrad Gomes <conrad.s.j.gomes@gmail.com>
Subject: [PATCH V2 5/7] Staging: comedi: change pr_err to dev_err in __unioxx5_digital_write
Date: Fri, 22 Nov 2013 01:27:56 +0530 [thread overview]
Message-ID: <1385063878-10267-6-git-send-email-conrad.s.j.gomes@gmail.com> (raw)
In-Reply-To: <1385063878-10267-1-git-send-email-conrad.s.j.gomes@gmail.com>
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 <conrad.s.j.gomes@gmail.com>
---
drivers/staging/comedi/drivers/unioxx5.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c
index 7edbd5e..343ba96 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))
--
1.7.9.5
next prev parent reply other threads:[~2013-11-21 20:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-21 19:57 [PATCH V2 0/7] Staging: comedi: fix coding style issues in unioxx5.c Conrad Gomes
2013-11-21 19:57 ` [PATCH V2 1/7] Staging: comedi: fix line over 80 character warning " Conrad Gomes
2013-11-21 19:57 ` [PATCH V2 2/7] " Conrad Gomes
2013-11-21 19:57 ` [PATCH V2 3/7] Staging: comedi: change printk to dev_err/dev_dbg " Conrad Gomes
2013-11-21 19:57 ` [PATCH V2 4/7] Staging: comedi: change pr_err to dev_err in __unioxx5_analog_read Conrad Gomes
2013-11-21 19:57 ` Conrad Gomes [this message]
2013-11-21 19:57 ` [PATCH V2 6/7] Staging: comedi: change pr_err to dev_err in __unioxx5_analog_write Conrad Gomes
2013-11-21 19:57 ` [PATCH V2 7/7] Staging: comedi: remove MACRO pr_fmt in unioxx5.c Conrad Gomes
2013-11-25 10:13 ` [PATCH V2 0/7] Staging: comedi: fix coding style issues " Ian Abbott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385063878-10267-6-git-send-email-conrad.s.j.gomes@gmail.com \
--to=conrad.s.j.gomes@gmail.com \
--cc=abbotti@mev.co.uk \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=hsweeten@visionengravers.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®