Skip to content

Commit

Permalink
ALSA: usb-audio: void return type of snd_usb_endpoint_deactivate()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eldad Zack authored and Takashi Iwai committed Oct 7, 2013
1 parent 239b9f7 commit 9b7c552
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
15 changes: 5 additions & 10 deletions sound/usb/endpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion sound/usb/endpoint.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 9b7c552

Please sign in to comment.