ALSA: Remove superfluous hwdep ops
Remove NOP hwdep ops in sound drivers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
Родитель
e0d80648c0
Коммит
28b7e343ee
|
|
@ -119,16 +119,6 @@ void snd_vx_free_firmware(struct vx_core *chip)
|
|||
|
||||
#else /* old style firmware loading */
|
||||
|
||||
static int vx_hwdep_open(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vx_hwdep_release(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vx_hwdep_dsp_status(struct snd_hwdep *hw,
|
||||
struct snd_hwdep_dsp_status *info)
|
||||
{
|
||||
|
|
@ -243,8 +233,6 @@ int snd_vx_setup_firmware(struct vx_core *chip)
|
|||
|
||||
hw->iface = SNDRV_HWDEP_IFACE_VX;
|
||||
hw->private_data = chip;
|
||||
hw->ops.open = vx_hwdep_open;
|
||||
hw->ops.release = vx_hwdep_release;
|
||||
hw->ops.dsp_status = vx_hwdep_dsp_status;
|
||||
hw->ops.dsp_load = vx_hwdep_dsp_load;
|
||||
hw->exclusive = 1;
|
||||
|
|
|
|||
|
|
@ -581,16 +581,6 @@ MODULE_FIRMWARE("mixart/miXart8AES.xlx");
|
|||
/* miXart hwdep interface id string */
|
||||
#define SND_MIXART_HWDEP_ID "miXart Loader"
|
||||
|
||||
static int mixart_hwdep_open(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mixart_hwdep_release(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mixart_hwdep_dsp_status(struct snd_hwdep *hw,
|
||||
struct snd_hwdep_dsp_status *info)
|
||||
{
|
||||
|
|
@ -643,8 +633,6 @@ int snd_mixart_setup_firmware(struct mixart_mgr *mgr)
|
|||
|
||||
hw->iface = SNDRV_HWDEP_IFACE_MIXART;
|
||||
hw->private_data = mgr;
|
||||
hw->ops.open = mixart_hwdep_open;
|
||||
hw->ops.release = mixart_hwdep_release;
|
||||
hw->ops.dsp_status = mixart_hwdep_dsp_status;
|
||||
hw->ops.dsp_load = mixart_hwdep_dsp_load;
|
||||
hw->exclusive = 1;
|
||||
|
|
|
|||
|
|
@ -471,16 +471,6 @@ static int pcxhr_hwdep_dsp_load(struct snd_hwdep *hw,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int pcxhr_hwdep_open(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int pcxhr_hwdep_release(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int pcxhr_setup_firmware(struct pcxhr_mgr *mgr)
|
||||
{
|
||||
int err;
|
||||
|
|
@ -495,8 +485,6 @@ int pcxhr_setup_firmware(struct pcxhr_mgr *mgr)
|
|||
|
||||
hw->iface = SNDRV_HWDEP_IFACE_PCXHR;
|
||||
hw->private_data = mgr;
|
||||
hw->ops.open = pcxhr_hwdep_open;
|
||||
hw->ops.release = pcxhr_hwdep_release;
|
||||
hw->ops.dsp_status = pcxhr_hwdep_dsp_status;
|
||||
hw->ops.dsp_load = pcxhr_hwdep_dsp_load;
|
||||
hw->exclusive = 1;
|
||||
|
|
|
|||
|
|
@ -4413,13 +4413,6 @@ static int snd_hdsp_capture_release(struct snd_pcm_substream *substream)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int snd_hdsp_hwdep_dummy_op(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
/* we have nothing to initialize but the call is required */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* helper functions for copying meter values */
|
||||
static inline int copy_u32_le(void __user *dest, void __iomem *src)
|
||||
{
|
||||
|
|
@ -4738,9 +4731,7 @@ static int snd_hdsp_create_hwdep(struct snd_card *card, struct hdsp *hdsp)
|
|||
hw->private_data = hdsp;
|
||||
strcpy(hw->name, "HDSP hwdep interface");
|
||||
|
||||
hw->ops.open = snd_hdsp_hwdep_dummy_op;
|
||||
hw->ops.ioctl = snd_hdsp_hwdep_ioctl;
|
||||
hw->ops.release = snd_hdsp_hwdep_dummy_op;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4100,13 +4100,6 @@ static int snd_hdspm_capture_release(struct snd_pcm_substream *substream)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int snd_hdspm_hwdep_dummy_op(struct snd_hwdep * hw, struct file *file)
|
||||
{
|
||||
/* we have nothing to initialize but the call is required */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
|
|
@ -4213,9 +4206,7 @@ static int __devinit snd_hdspm_create_hwdep(struct snd_card *card,
|
|||
hw->private_data = hdspm;
|
||||
strcpy(hw->name, "HDSPM hwdep interface");
|
||||
|
||||
hw->ops.open = snd_hdspm_hwdep_dummy_op;
|
||||
hw->ops.ioctl = snd_hdspm_hwdep_ioctl;
|
||||
hw->ops.release = snd_hdspm_hwdep_dummy_op;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,25 +24,6 @@
|
|||
#include <asm/uaccess.h>
|
||||
#include "emux_voice.h"
|
||||
|
||||
/*
|
||||
* open the hwdep device
|
||||
*/
|
||||
static int
|
||||
snd_emux_hwdep_open(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* close the device
|
||||
*/
|
||||
static int
|
||||
snd_emux_hwdep_release(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#define TMP_CLIENT_ID 0x1001
|
||||
|
||||
|
|
@ -146,8 +127,6 @@ snd_emux_init_hwdep(struct snd_emux *emu)
|
|||
emu->hwdep = hw;
|
||||
strcpy(hw->name, SNDRV_EMUX_HWDEP_NAME);
|
||||
hw->iface = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE;
|
||||
hw->ops.open = snd_emux_hwdep_open;
|
||||
hw->ops.release = snd_emux_hwdep_release;
|
||||
hw->ops.ioctl = snd_emux_hwdep_ioctl;
|
||||
hw->exclusive = 1;
|
||||
hw->private_data = emu;
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ struct usb_mixer_interface {
|
|||
|
||||
/* Sound Blaster remote control stuff */
|
||||
const struct rc_config *rc_cfg;
|
||||
unsigned long rc_hwdep_open;
|
||||
u32 rc_code;
|
||||
wait_queue_head_t rc_waitq;
|
||||
struct urb *rc_urb;
|
||||
|
|
@ -1797,24 +1796,6 @@ static void snd_usb_soundblaster_remote_complete(struct urb *urb)
|
|||
wake_up(&mixer->rc_waitq);
|
||||
}
|
||||
|
||||
static int snd_usb_sbrc_hwdep_open(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
struct usb_mixer_interface *mixer = hw->private_data;
|
||||
|
||||
if (test_and_set_bit(0, &mixer->rc_hwdep_open))
|
||||
return -EBUSY;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_usb_sbrc_hwdep_release(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
struct usb_mixer_interface *mixer = hw->private_data;
|
||||
|
||||
clear_bit(0, &mixer->rc_hwdep_open);
|
||||
smp_mb__after_clear_bit();
|
||||
return 0;
|
||||
}
|
||||
|
||||
static long snd_usb_sbrc_hwdep_read(struct snd_hwdep *hw, char __user *buf,
|
||||
long count, loff_t *offset)
|
||||
{
|
||||
|
|
@ -1867,9 +1848,8 @@ static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
|
|||
hwdep->iface = SNDRV_HWDEP_IFACE_SB_RC;
|
||||
hwdep->private_data = mixer;
|
||||
hwdep->ops.read = snd_usb_sbrc_hwdep_read;
|
||||
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->exclusive = 1;
|
||||
|
||||
mixer->rc_urb = usb_alloc_urb(0, GFP_KERNEL);
|
||||
if (!mixer->rc_urb)
|
||||
|
|
|
|||
|
|
@ -106,16 +106,6 @@ static unsigned int snd_us428ctls_poll(struct snd_hwdep *hw, struct file *file,
|
|||
}
|
||||
|
||||
|
||||
static int snd_usX2Y_hwdep_open(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_usX2Y_hwdep_release(struct snd_hwdep *hw, struct file *file)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw,
|
||||
struct snd_hwdep_dsp_status *info)
|
||||
{
|
||||
|
|
@ -267,8 +257,6 @@ int usX2Y_hwdep_new(struct snd_card *card, struct usb_device* device)
|
|||
|
||||
hw->iface = SNDRV_HWDEP_IFACE_USX2Y;
|
||||
hw->private_data = usX2Y(card);
|
||||
hw->ops.open = snd_usX2Y_hwdep_open;
|
||||
hw->ops.release = snd_usX2Y_hwdep_release;
|
||||
hw->ops.dsp_status = snd_usX2Y_hwdep_dsp_status;
|
||||
hw->ops.dsp_load = snd_usX2Y_hwdep_dsp_load;
|
||||
hw->ops.mmap = snd_us428ctls_mmap;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче