diff options
| author | Eldad Zack <eldad@fogrefinery.com> | 2013-10-07 00:31:10 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-07 13:00:03 +0400 |
| commit | 9b7c552bba88748001574925b80ba520691b0e4d (patch) | |
| tree | 610ac181a22234650ffe02b245a1d45bba48c2b8 /sound/usb | |
| parent | 239b9f7990873d851335ed23fa091ce1484a5bcc (diff) | |
| download | linux-9b7c552bba88748001574925b80ba520691b0e4d.tar.xz | |
ALSA: usb-audio: void return type of snd_usb_endpoint_deactivate()
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/endpoint.c | 15 | ||||
| -rw-r--r-- | 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 e84732c874cb..26856601422b 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -946,28 +946,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 3bd02f0d226c..1c7e8ee48abc 100644 --- a/sound/usb/endpoint.h +++ b/sound/usb/endpoint.h @@ -22,7 +22,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); |