diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:41 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:41 -0400 |
commit | c2f43981e5dbc92884149aa2234064cc2c340acd (patch) | |
tree | bd5273bc7ae92a1ef47fa3f35ec6ef79d28ba270 /sound/drivers | |
parent | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (diff) | |
parent | 28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff) |
Merge branch 'topic/hwdep-cleanup' into for-linus
Diffstat (limited to 'sound/drivers')
-rw-r--r-- | sound/drivers/vx/vx_hwdep.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c index 8d6362e2d4c9..46df8817c18f 100644 --- a/sound/drivers/vx/vx_hwdep.c +++ b/sound/drivers/vx/vx_hwdep.c | |||
@@ -119,16 +119,6 @@ void snd_vx_free_firmware(struct vx_core *chip) | |||
119 | 119 | ||
120 | #else /* old style firmware loading */ | 120 | #else /* old style firmware loading */ |
121 | 121 | ||
122 | static int vx_hwdep_open(struct snd_hwdep *hw, struct file *file) | ||
123 | { | ||
124 | return 0; | ||
125 | } | ||
126 | |||
127 | static int vx_hwdep_release(struct snd_hwdep *hw, struct file *file) | ||
128 | { | ||
129 | return 0; | ||
130 | } | ||
131 | |||
132 | static int vx_hwdep_dsp_status(struct snd_hwdep *hw, | 122 | static int vx_hwdep_dsp_status(struct snd_hwdep *hw, |
133 | struct snd_hwdep_dsp_status *info) | 123 | struct snd_hwdep_dsp_status *info) |
134 | { | 124 | { |
@@ -243,8 +233,6 @@ int snd_vx_setup_firmware(struct vx_core *chip) | |||
243 | 233 | ||
244 | hw->iface = SNDRV_HWDEP_IFACE_VX; | 234 | hw->iface = SNDRV_HWDEP_IFACE_VX; |
245 | hw->private_data = chip; | 235 | hw->private_data = chip; |
246 | hw->ops.open = vx_hwdep_open; | ||
247 | hw->ops.release = vx_hwdep_release; | ||
248 | hw->ops.dsp_status = vx_hwdep_dsp_status; | 236 | hw->ops.dsp_status = vx_hwdep_dsp_status; |
249 | hw->ops.dsp_load = vx_hwdep_dsp_load; | 237 | hw->ops.dsp_load = vx_hwdep_dsp_load; |
250 | hw->exclusive = 1; | 238 | hw->exclusive = 1; |