summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-05-24 05:15:45 -0400
committerTakashi Iwai <tiwai@suse.de>2018-05-24 05:19:42 -0400
commitb6622f573ece9ddbf1d4c6808a6ad564f32b7b47 (patch)
tree5ddb5137bb85b82949826098f0aa7de85b3c07bc
parent96961fa048cf2eef2b53cbc26313629937198996 (diff)
ALSA: usb-audio: Drop superfluous ifndef
Drop the superfluous #ifndef checks that had been put just for allowing building the alsa-driver kernel modules externally. Since the external build was discontinued years ago, let's clean up the old kludges. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/helper.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/usb/helper.h b/sound/usb/helper.h
index 4463e6d6dcb3..d338bd0e0ca6 100644
--- a/sound/usb/helper.h
+++ b/sound/usb/helper.h
@@ -18,16 +18,12 @@ unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip,
18 * retrieve usb_interface descriptor from the host interface 18 * retrieve usb_interface descriptor from the host interface
19 * (conditional for compatibility with the older API) 19 * (conditional for compatibility with the older API)
20 */ 20 */
21#ifndef get_iface_desc
22#define get_iface_desc(iface) (&(iface)->desc) 21#define get_iface_desc(iface) (&(iface)->desc)
23#define get_endpoint(alt,ep) (&(alt)->endpoint[ep].desc) 22#define get_endpoint(alt,ep) (&(alt)->endpoint[ep].desc)
24#define get_ep_desc(ep) (&(ep)->desc) 23#define get_ep_desc(ep) (&(ep)->desc)
25#define get_cfg_desc(cfg) (&(cfg)->desc) 24#define get_cfg_desc(cfg) (&(cfg)->desc)
26#endif
27 25
28#ifndef snd_usb_get_speed
29#define snd_usb_get_speed(dev) ((dev)->speed) 26#define snd_usb_get_speed(dev) ((dev)->speed)
30#endif
31 27
32static inline int snd_usb_ctrl_intf(struct snd_usb_audio *chip) 28static inline int snd_usb_ctrl_intf(struct snd_usb_audio *chip)
33{ 29{