Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f55a655b authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[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: default avatarClemens Ladisch <clemens@ladisch.de>
parent 3a2f0856

sound/usb/usbmixer.c

+0 −33
Original line number Diff line number Diff line
@@ -39,19 +39,6 @@ 


#include "usbaudio.h"



#if 0

#include <linux/lirc.h>

#else

/* only those symbols from lirc.h we actually need: */

#include <linux/ioctl.h>

#define LIRC_MODE2REC(x)	((x) << 16)

#define LIRC_MODE_CODE		0x00000008

#define LIRC_CAN_REC_CODE	LIRC_MODE2REC(LIRC_MODE_CODE)

#define LIRC_GET_FEATURES	_IOR('i', 0x00000000, __u32)

#define LIRC_GET_REC_MODE	_IOR('i', 0x00000002, __u32)

#define LIRC_SET_REC_MODE	_IOW('i', 0x00000012, __u32)

#endif



/*

 */
@@ -1775,25 +1762,6 @@ static unsigned int snd_usb_sbrc_hwdep_poll(snd_hwdep_t *hw, struct file *file, 
	return mixer->rc_code ? POLLIN | POLLRDNORM : 0;

}



static int snd_usb_sbrc_hwdep_ioctl(snd_hwdep_t *hw, struct file *file,

				    unsigned int cmd, unsigned long arg)

{

	u32 __user *argp = (u32 __user *)arg;

	u32 mode;



	switch (cmd) {

	case LIRC_GET_FEATURES:

		return put_user(LIRC_CAN_REC_CODE, argp);

	case LIRC_GET_REC_MODE:

		return put_user(LIRC_MODE_CODE, argp);

	case LIRC_SET_REC_MODE:

		if (get_user(mode, argp))

			return -EFAULT;

		return mode == LIRC_MODE_CODE ? 0 : -ENOSYS;

	}

	return -ENOTTY;

}



static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)

{

	snd_hwdep_t *hwdep;
@@ -1824,7 +1792,6 @@ static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer) 
	hwdep->ops.open = snd_usb_sbrc_hwdep_open;

	hwdep->ops.release = snd_usb_sbrc_hwdep_release;

	hwdep->ops.poll = snd_usb_sbrc_hwdep_poll;

	hwdep->ops.ioctl = snd_usb_sbrc_hwdep_ioctl; 



	mixer->rc_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!mixer->rc_urb)