Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9b7c552bba88748001574925b80ba520691b0e4d

Authored by Eldad Zack
Committed by Takashi Iwai
1 parent 239b9f7990
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 6 additions and 11 deletions Side-by-side Diff

sound/usb/endpoint.c
Diff comments   View file @ 9b7c552
... ... @@ -946,28 +946,23 @@
946 946 *
947 947 * @ep: the endpoint to deactivate
948 948 *
949   - * If the endpoint is not currently in use, this functions will select the
950   - * alternate interface setting 0 for the interface of this endpoint.
  949 + * If the endpoint is not currently in use, this functions will
  950 + * deactivate its associated URBs.
951 951 *
952 952 * In case of any active users, this functions does nothing.
953   - *
954   - * Returns an error if usb_set_interface() failed, 0 in all other
955   - * cases.
956 953 */
957   -int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep)
  954 +void snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep)
958 955 {
959 956 if (!ep)
960   - return -EINVAL;
  957 + return;
961 958  
962 959 if (ep->use_count != 0)
963   - return 0;
  960 + return;
964 961  
965 962 deactivate_urbs(ep, true);
966 963 wait_clear_urbs(ep);
967 964  
968 965 clear_bit(EP_FLAG_ACTIVATED, &ep->flags);
969   -
970   - return 0;
971 966 }
972 967  
973 968 /**
sound/usb/endpoint.h
Diff comments   View file @ 9b7c552
... ... @@ -22,7 +22,7 @@
22 22 void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep);
23 23 void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep);
24 24 int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep);
25   -int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep);
  25 +void snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep);
26 26 void snd_usb_endpoint_free(struct list_head *head);
27 27  
28 28 int snd_usb_endpoint_implicit_feedback_sink(struct snd_usb_endpoint *ep);