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

Commit 28b7e343 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: Remove superfluous hwdep ops 



Remove NOP hwdep ops in sound drivers.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e0d80648

sound/drivers/vx/vx_hwdep.c

+0 −12
Original line number Diff line number Diff line
@@ -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;

sound/pci/mixart/mixart_hwdep.c

+0 −12
Original line number Diff line number Diff line
@@ -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;

sound/pci/pcxhr/pcxhr_hwdep.c

+0 −12
Original line number Diff line number Diff line
@@ -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;

sound/pci/rme9652/hdsp.c

+0 −9
Original line number Diff line number Diff line
@@ -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;

}

sound/pci/rme9652/hdspm.c

+0 −9
Original line number Diff line number Diff line
@@ -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;

}