aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/pcxhr
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:41 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:41 +0100
commitc2f43981e5dbc92884149aa2234064cc2c340acd (patch)
treebd5273bc7ae92a1ef47fa3f35ec6ef79d28ba270 /sound/pci/pcxhr
parentMerge branch 'topic/snd_card_new-err' into for-linus (diff)
parentALSA: Remove superfluous hwdep ops (diff)
downloadlinux-dev-c2f43981e5dbc92884149aa2234064cc2c340acd.tar.xz
linux-dev-c2f43981e5dbc92884149aa2234064cc2c340acd.zip
Merge branch 'topic/hwdep-cleanup' into for-linus
Diffstat (limited to 'sound/pci/pcxhr')
-rw-r--r--sound/pci/pcxhr/pcxhr_hwdep.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index 592743a298b0..17cb1233a903 100644
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -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;