diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-05-09 03:21:28 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-05-29 04:06:31 -0400 |
commit | f55a655bf9eeb1431633bd313f47c8e4dadcf47c (patch) | |
tree | 62b3427dcca236cf76e4098d79ee6872b2caeb9c /sound/usb | |
parent | 3a2f08560d61e267aacddc63c26bf997d0d85e91 (diff) |
[ALSA] usb-audio - remove superfluous LIRC ioctls
USB generic driver
The ioctls for LIRC compatibility can be removed because the
infrastructure and detection stuff is better done in user space.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbmixer.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index ec880ff52625..4a49e1930a1a 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c | |||
@@ -39,19 +39,6 @@ | |||
39 | 39 | ||
40 | #include "usbaudio.h" | 40 | #include "usbaudio.h" |
41 | 41 | ||
42 | #if 0 | ||
43 | #include <linux/lirc.h> | ||
44 | #else | ||
45 | /* only those symbols from lirc.h we actually need: */ | ||
46 | #include <linux/ioctl.h> | ||
47 | #define LIRC_MODE2REC(x) ((x) << 16) | ||
48 | #define LIRC_MODE_CODE 0x00000008 | ||
49 | #define LIRC_CAN_REC_CODE LIRC_MODE2REC(LIRC_MODE_CODE) | ||
50 | #define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32) | ||
51 | #define LIRC_GET_REC_MODE _IOR('i', 0x00000002, __u32) | ||
52 | #define LIRC_SET_REC_MODE _IOW('i', 0x00000012, __u32) | ||
53 | #endif | ||
54 | |||
55 | /* | 42 | /* |
56 | */ | 43 | */ |
57 | 44 | ||
@@ -1775,25 +1762,6 @@ static unsigned int snd_usb_sbrc_hwdep_poll(snd_hwdep_t *hw, struct file *file, | |||
1775 | return mixer->rc_code ? POLLIN | POLLRDNORM : 0; | 1762 | return mixer->rc_code ? POLLIN | POLLRDNORM : 0; |
1776 | } | 1763 | } |
1777 | 1764 | ||
1778 | static int snd_usb_sbrc_hwdep_ioctl(snd_hwdep_t *hw, struct file *file, | ||
1779 | unsigned int cmd, unsigned long arg) | ||
1780 | { | ||
1781 | u32 __user *argp = (u32 __user *)arg; | ||
1782 | u32 mode; | ||
1783 | |||
1784 | switch (cmd) { | ||
1785 | case LIRC_GET_FEATURES: | ||
1786 | return put_user(LIRC_CAN_REC_CODE, argp); | ||
1787 | case LIRC_GET_REC_MODE: | ||
1788 | return put_user(LIRC_MODE_CODE, argp); | ||
1789 | case LIRC_SET_REC_MODE: | ||
1790 | if (get_user(mode, argp)) | ||
1791 | return -EFAULT; | ||
1792 | return mode == LIRC_MODE_CODE ? 0 : -ENOSYS; | ||
1793 | } | ||
1794 | return -ENOTTY; | ||
1795 | } | ||
1796 | |||
1797 | static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer) | 1765 | static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer) |
1798 | { | 1766 | { |
1799 | snd_hwdep_t *hwdep; | 1767 | snd_hwdep_t *hwdep; |
@@ -1824,7 +1792,6 @@ static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer) | |||
1824 | hwdep->ops.open = snd_usb_sbrc_hwdep_open; | 1792 | hwdep->ops.open = snd_usb_sbrc_hwdep_open; |
1825 | hwdep->ops.release = snd_usb_sbrc_hwdep_release; | 1793 | hwdep->ops.release = snd_usb_sbrc_hwdep_release; |
1826 | hwdep->ops.poll = snd_usb_sbrc_hwdep_poll; | 1794 | hwdep->ops.poll = snd_usb_sbrc_hwdep_poll; |
1827 | hwdep->ops.ioctl = snd_usb_sbrc_hwdep_ioctl; | ||
1828 | 1795 | ||
1829 | mixer->rc_urb = usb_alloc_urb(0, GFP_KERNEL); | 1796 | mixer->rc_urb = usb_alloc_urb(0, GFP_KERNEL); |
1830 | if (!mixer->rc_urb) | 1797 | if (!mixer->rc_urb) |