From e8e8babf561c9560f37b9bd80407ebaf90ad2ca4 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Mon, 12 Sep 2011 18:54:12 +0200 Subject: ALSA: snd-usb: re-order code Move code from endpoint.c into a new file called stream.c and rename functions so that their names actually reflect what they're doing. This way, endpoint.c will be available to functions that hold all the endpoint logic. Signed-off-by: Daniel Mack Acked-by: Clemens Ladisch Signed-off-by: Takashi Iwai --- sound/usb/card.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sound/usb/card.c') diff --git a/sound/usb/card.c b/sound/usb/card.c index 781d9e61adfb..a3136afb2198 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -68,6 +68,7 @@ #include "urb.h" #include "format.h" #include "power.h" +#include "stream.h" MODULE_AUTHOR("Takashi Iwai "); MODULE_DESCRIPTION("USB Audio"); @@ -185,7 +186,7 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int return -EINVAL; } - if (! snd_usb_parse_audio_endpoints(chip, interface)) { + if (! snd_usb_parse_audio_interface(chip, interface)) { usb_set_interface(dev, interface, 0); /* reset the current interface */ usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L); return -EINVAL; -- cgit v1.2.2 From c731bc96ad641a5fa3d50a87b474652505507282 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Wed, 14 Sep 2011 12:46:57 +0200 Subject: ALSA: snd-usb: move code from urb.c to endpoint.c No code altered at this point, simply preparing for upcoming refactorizations. Signed-off-by: Daniel Mack Acked-by: Clemens Ladisch Signed-off-by: Takashi Iwai --- sound/usb/card.c | 1 - 1 file changed, 1 deletion(-) (limited to 'sound/usb/card.c') diff --git a/sound/usb/card.c b/sound/usb/card.c index a3136afb2198..d2a79d166e04 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -65,7 +65,6 @@ #include "helper.h" #include "debug.h" #include "pcm.h" -#include "urb.h" #include "format.h" #include "power.h" #include "stream.h" -- cgit v1.2.2