From: David Ellingsworth <david@identd.dyndns.org>
To: linux-media@vger.kernel.org
Cc: Markus Demleitner <msdemlei@tucana.harvard.edu>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
David Ellingsworth <david@identd.dyndns.org>
Subject: [PATCH/RFC v2 5/8] dsbr100: cleanup return value of start/stop handlers
Date: Thu, 27 May 2010 12:39:13 -0400 [thread overview]
Message-ID: <1274978356-25836-6-git-send-email-david@identd.dyndns.org> (raw)
In-Reply-To: <[PATCH/RFC 0/7] dsbr100: driver cleanup>
The value returned from the device in radio->transfer_buffer[0]
isn't clearly defined, but is used as a return code. This value
is an unsigned 8-bit integer that is implicitly converted to an
int. Since this value can never be less than 0, return 0 instead.
This simplifies the verification of calling dsbr100_start and
dsbr100_stop.
Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
---
drivers/media/radio/dsbr100.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index c949ace..0e009b7 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -206,7 +206,7 @@ static int dsbr100_start(struct dsbr100_device *radio)
}
radio->status = STARTED;
- return (radio->transfer_buffer)[0];
+ return 0;
usb_control_msg_failed:
dev_err(&radio->usbdev->dev,
@@ -247,7 +247,7 @@ static int dsbr100_stop(struct dsbr100_device *radio)
}
radio->status = STOPPED;
- return (radio->transfer_buffer)[0];
+ return 0;
usb_control_msg_failed:
dev_err(&radio->usbdev->dev,
@@ -461,14 +461,14 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
case V4L2_CID_AUDIO_MUTE:
if (ctrl->value) {
retval = dsbr100_stop(radio);
- if (retval < 0) {
+ if (retval) {
dev_warn(&radio->usbdev->dev,
"Radio did not respond properly\n");
return -EBUSY;
}
} else {
retval = dsbr100_start(radio);
- if (retval < 0) {
+ if (retval) {
dev_warn(&radio->usbdev->dev,
"Radio did not respond properly\n");
return -EBUSY;
@@ -542,7 +542,7 @@ static int usb_dsbr100_suspend(struct usb_interface *intf, pm_message_t message)
if (radio->status == STARTED) {
retval = dsbr100_stop(radio);
- if (retval < 0)
+ if (retval)
dev_warn(&intf->dev, "dsbr100_stop failed\n");
/* After dsbr100_stop() status set to STOPPED.
@@ -569,7 +569,7 @@ static int usb_dsbr100_resume(struct usb_interface *intf)
if (radio->status == STARTED) {
retval = dsbr100_start(radio);
- if (retval < 0)
+ if (retval)
dev_warn(&intf->dev, "dsbr100_start failed\n");
}
--
1.7.1
next prev parent reply other threads:[~2010-05-27 16:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <[PATCH/RFC 0/7] dsbr100: driver cleanup>
2010-05-27 16:39 ` [PATCH/RFC v2 0/8] dsbr100: driver cleanup and fixes David Ellingsworth
2010-07-07 22:19 ` David Ellingsworth
2010-09-14 14:56 ` David Ellingsworth
2010-09-14 15:25 ` Douglas Schilling Landgraf
2010-10-01 12:43 ` David Ellingsworth
2010-10-01 13:17 ` Bjørn Mork
2010-05-27 16:39 ` [PATCH/RFC v2 1/8] dsbr100: implement proper locking David Ellingsworth
2010-05-27 16:39 ` [PATCH/RFC v2 2/8] dsbr100: fix potential use after free David Ellingsworth
2010-05-27 16:39 ` [PATCH/RFC v2 3/8] dsbr100: only change frequency upon success David Ellingsworth
2010-05-27 16:39 ` [PATCH/RFC v2 4/8] dsbr100: remove disconnected indicator David Ellingsworth
2010-05-27 16:39 ` David Ellingsworth [this message]
2010-05-27 16:39 ` [PATCH/RFC v2 6/8] dsbr100: properly initialize the radio David Ellingsworth
2010-05-27 16:39 ` [PATCH/RFC v2 7/8] dsbr100: cleanup usb probe routine David Ellingsworth
2010-05-27 16:39 ` [PATCH/RFC v2 8/8] dsbr100: simplify access to radio device David Ellingsworth
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=1274978356-25836-6-git-send-email-david@identd.dyndns.org \
--to=david@identd.dyndns.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=msdemlei@tucana.harvard.edu \
/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;
as well as URLs for NNTP newsgroup(s).