OSDN Git Service

ALSA: usb-audio: Drop superfluous ifndef
authorTakashi Iwai <tiwai@suse.de>
Thu, 24 May 2018 09:15:45 +0000 (11:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 May 2018 09:19:42 +0000 (11:19 +0200)
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>
sound/usb/helper.h

index 4463e6d..d338bd0 100644 (file)
@@ -18,16 +18,12 @@ unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip,
  * retrieve usb_interface descriptor from the host interface
  * (conditional for compatibility with the older API)
  */
-#ifndef get_iface_desc
 #define get_iface_desc(iface)  (&(iface)->desc)
 #define get_endpoint(alt,ep)   (&(alt)->endpoint[ep].desc)
 #define get_ep_desc(ep)                (&(ep)->desc)
 #define get_cfg_desc(cfg)      (&(cfg)->desc)
-#endif
 
-#ifndef snd_usb_get_speed
 #define snd_usb_get_speed(dev) ((dev)->speed)
-#endif
 
 static inline int snd_usb_ctrl_intf(struct snd_usb_audio *chip)
 {