From: Eldad Zack <eldad@fogrefinery.com>
To: Takashi Iwai <tiwai@suse.de>,
Clemens Ladisch <clemens@ladisch.de>,
Daniel Mack <zonque@gmail.com>
Cc: alsa-devel@alsa-project.org, Eldad Zack <eldad@fogrefinery.com>
Subject: [PATCH v3 05/11] ALSA: usb-audio: void return type of snd_usb_endpoint_deactivate()
Date: Sun, 25 Aug 2013 17:45:26 +0200 [thread overview]
Message-ID: <1377445532-5876-2-git-send-email-eldad@fogrefinery.com> (raw)
In-Reply-To: <1377445399-5678-1-git-send-email-eldad@fogrefinery.com>
The return value of snd_usb_endpoint_deactivate() is not used,
make the function have no return value.
Update the documentation to reflect what the function is actually
doing.
Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
---
sound/usb/endpoint.c | 15 +++++----------
sound/usb/endpoint.h | 2 +-
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 420df01..c6fcb7b 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -930,28 +930,23 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep)
*
* @ep: the endpoint to deactivate
*
- * If the endpoint is not currently in use, this functions will select the
- * alternate interface setting 0 for the interface of this endpoint.
+ * If the endpoint is not currently in use, this functions will
+ * deactivate its associated URBs.
*
* In case of any active users, this functions does nothing.
- *
- * Returns an error if usb_set_interface() failed, 0 in all other
- * cases.
*/
-int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep)
+void snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep)
{
if (!ep)
- return -EINVAL;
+ return;
if (ep->use_count != 0)
- return 0;
+ return;
deactivate_urbs(ep, true);
wait_clear_urbs(ep);
clear_bit(EP_FLAG_ACTIVATED, &ep->flags);
-
- return 0;
}
/**
diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h
index 2287adf..c928e0c 100644
--- a/sound/usb/endpoint.h
+++ b/sound/usb/endpoint.h
@@ -20,7 +20,7 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep);
void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep);
void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep);
int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep);
-int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep);
+void snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep);
void snd_usb_endpoint_free(struct list_head *head);
int snd_usb_endpoint_implicit_feedback_sink(struct snd_usb_endpoint *ep);
--
1.8.1.5
next prev parent reply other threads:[~2013-08-25 15:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-25 15:43 [PATCH v3 00/11] ALSA: usb-audio: fix playback/capture concurrent usage Eldad Zack
2013-08-25 15:43 ` [PATCH v3 01/11] ALSA: usb-audio: remove unused parameter from sync_ep_set_params Eldad Zack
2013-08-25 15:43 ` [PATCH v3 02/11] ALSA: usb-audio: remove deactivate_endpoints() Eldad Zack
2013-08-25 15:43 ` [PATCH v3 03/11] ALSA: usb-audio: prevent NULL dereference on stop trigger Eldad Zack
2013-08-25 15:45 ` [PATCH v3 04/11] ALSA: usb-audio: don't deactivate URBs on in-use EP Eldad Zack
2013-08-25 15:45 ` Eldad Zack [this message]
2013-08-25 15:45 ` [PATCH v3 06/11] ALSA: usb-audio: clear SUBSTREAM_FLAG_SYNC_EP_STARTED on error Eldad Zack
2013-08-25 15:45 ` [PATCH v3 07/11] ALSA: usb-audio: correct ep use_count semantics (add set_param flag) Eldad Zack
2013-08-25 15:45 ` [PATCH v3 08/11] ALSA: usb-audio: conditional interface altsetting Eldad Zack
2013-08-25 15:45 ` [PATCH v3 09/11] ALSA: usb-audio: conditional concurrent usage of endpoint Eldad Zack
2013-08-25 15:45 ` [PATCH v3 10/11] ALSA: usb-audio: remove altset_idx from snd_usb_substream Eldad Zack
2013-08-25 15:45 ` [PATCH v3 11/11] ALSA: usb-audio: rename alt_idx to altsetting Eldad Zack
2013-08-25 21:10 ` [PATCH v3 00/11] ALSA: usb-audio: fix playback/capture concurrent usage Eldad Zack
2013-08-26 23:23 ` Nikolay Martynov
2013-09-01 8:54 ` Eldad Zack
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=1377445532-5876-2-git-send-email-eldad@fogrefinery.com \
--to=eldad@fogrefinery.com \
--cc=alsa-devel@alsa-project.org \
--cc=clemens@ladisch.de \
--cc=tiwai@suse.de \
--cc=zonque@gmail.com \
/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