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/pci/mixart | |
parent | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (diff) | |
parent | 28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff) |
Merge branch 'topic/hwdep-cleanup' into for-linus
Diffstat (limited to 'sound/pci/mixart')
-rw-r--r-- | sound/pci/mixart/mixart_hwdep.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c index 3782b52bc0e8..fa4de985fc4c 100644 --- a/sound/pci/mixart/mixart_hwdep.c +++ b/sound/pci/mixart/mixart_hwdep.c | |||
@@ -581,16 +581,6 @@ MODULE_FIRMWARE("mixart/miXart8AES.xlx"); | |||
581 | /* miXart hwdep interface id string */ | 581 | /* miXart hwdep interface id string */ |
582 | #define SND_MIXART_HWDEP_ID "miXart Loader" | 582 | #define SND_MIXART_HWDEP_ID "miXart Loader" |
583 | 583 | ||
584 | static int mixart_hwdep_open(struct snd_hwdep *hw, struct file *file) | ||
585 | { | ||
586 | return 0; | ||
587 | } | ||
588 | |||
589 | static int mixart_hwdep_release(struct snd_hwdep *hw, struct file *file) | ||
590 | { | ||
591 | return 0; | ||
592 | } | ||
593 | |||
594 | static int mixart_hwdep_dsp_status(struct snd_hwdep *hw, | 584 | static int mixart_hwdep_dsp_status(struct snd_hwdep *hw, |
595 | struct snd_hwdep_dsp_status *info) | 585 | struct snd_hwdep_dsp_status *info) |
596 | { | 586 | { |
@@ -643,8 +633,6 @@ int snd_mixart_setup_firmware(struct mixart_mgr *mgr) | |||
643 | 633 | ||
644 | hw->iface = SNDRV_HWDEP_IFACE_MIXART; | 634 | hw->iface = SNDRV_HWDEP_IFACE_MIXART; |
645 | hw->private_data = mgr; | 635 | hw->private_data = mgr; |
646 | hw->ops.open = mixart_hwdep_open; | ||
647 | hw->ops.release = mixart_hwdep_release; | ||
648 | hw->ops.dsp_status = mixart_hwdep_dsp_status; | 636 | hw->ops.dsp_status = mixart_hwdep_dsp_status; |
649 | hw->ops.dsp_load = mixart_hwdep_dsp_load; | 637 | hw->ops.dsp_load = mixart_hwdep_dsp_load; |
650 | hw->exclusive = 1; | 638 | hw->exclusive = 1; |