diff options
author | Eliot Blennerhassett <eblennerhassett@audioscience.com> | 2011-02-09 23:26:14 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-02-10 12:49:35 -0500 |
commit | ba3a909962650d81e9c3731d87b8653652869685 (patch) | |
tree | 65e156a29d20bf71e5a91501890eaaa1e13d82b3 /sound/pci/asihpi/hpi6205.c | |
parent | ee246fc041c4ace7a8cc3d995716cbc8f8f6cd5c (diff) |
ALSA: asihpi - Remove unused code and data.
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/asihpi/hpi6205.c')
-rw-r--r-- | sound/pci/asihpi/hpi6205.c | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c index 377e56f59a86..33136cb0d251 100644 --- a/sound/pci/asihpi/hpi6205.c +++ b/sound/pci/asihpi/hpi6205.c | |||
@@ -127,9 +127,6 @@ struct hpi_hw_obj { | |||
127 | u32 outstream_host_buffer_size[HPI_MAX_STREAMS]; | 127 | u32 outstream_host_buffer_size[HPI_MAX_STREAMS]; |
128 | 128 | ||
129 | struct consistent_dma_area h_control_cache; | 129 | struct consistent_dma_area h_control_cache; |
130 | struct consistent_dma_area h_async_event_buffer; | ||
131 | /* struct hpi_control_cache_single *pControlCache; */ | ||
132 | struct hpi_async_event *p_async_event_buffer; | ||
133 | struct hpi_control_cache *p_cache; | 130 | struct hpi_control_cache *p_cache; |
134 | }; | 131 | }; |
135 | 132 | ||
@@ -625,34 +622,6 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao, | |||
625 | pao->has_control_cache = 0; | 622 | pao->has_control_cache = 0; |
626 | } | 623 | } |
627 | } | 624 | } |
628 | /* allocate bus mastering async buffer and tell the DSP about it */ | ||
629 | if (interface->async_buffer.b.size) { | ||
630 | err = hpios_locked_mem_alloc(&phw->h_async_event_buffer, | ||
631 | interface->async_buffer.b.size * | ||
632 | sizeof(struct hpi_async_event), pao->pci.pci_dev); | ||
633 | if (!err) | ||
634 | err = hpios_locked_mem_get_virt_addr | ||
635 | (&phw->h_async_event_buffer, (void *) | ||
636 | &phw->p_async_event_buffer); | ||
637 | if (!err) | ||
638 | memset((void *)phw->p_async_event_buffer, 0, | ||
639 | interface->async_buffer.b.size * | ||
640 | sizeof(struct hpi_async_event)); | ||
641 | if (!err) { | ||
642 | err = hpios_locked_mem_get_phys_addr | ||
643 | (&phw->h_async_event_buffer, &phys_addr); | ||
644 | interface->async_buffer.physical_address32 = | ||
645 | phys_addr; | ||
646 | } | ||
647 | if (err) { | ||
648 | if (hpios_locked_mem_valid(&phw-> | ||
649 | h_async_event_buffer)) { | ||
650 | hpios_locked_mem_free | ||
651 | (&phw->h_async_event_buffer); | ||
652 | phw->p_async_event_buffer = NULL; | ||
653 | } | ||
654 | } | ||
655 | } | ||
656 | send_dsp_command(phw, H620_HIF_IDLE); | 625 | send_dsp_command(phw, H620_HIF_IDLE); |
657 | 626 | ||
658 | { | 627 | { |
@@ -716,11 +685,6 @@ static void delete_adapter_obj(struct hpi_adapter_obj *pao) | |||
716 | 685 | ||
717 | phw = pao->priv; | 686 | phw = pao->priv; |
718 | 687 | ||
719 | if (hpios_locked_mem_valid(&phw->h_async_event_buffer)) { | ||
720 | hpios_locked_mem_free(&phw->h_async_event_buffer); | ||
721 | phw->p_async_event_buffer = NULL; | ||
722 | } | ||
723 | |||
724 | if (hpios_locked_mem_valid(&phw->h_control_cache)) { | 688 | if (hpios_locked_mem_valid(&phw->h_control_cache)) { |
725 | hpios_locked_mem_free(&phw->h_control_cache); | 689 | hpios_locked_mem_free(&phw->h_control_cache); |
726 | hpi_free_control_cache(phw->p_cache); | 690 | hpi_free_control_cache(phw->p_cache); |
@@ -1126,6 +1090,7 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao, | |||
1126 | status->auxiliary_data_available = 0; | 1090 | status->auxiliary_data_available = 0; |
1127 | 1091 | ||
1128 | hw_message(pao, phm, phr); | 1092 | hw_message(pao, phm, phr); |
1093 | |||
1129 | if (phr->error | 1094 | if (phr->error |
1130 | && hpios_locked_mem_valid(&phw-> | 1095 | && hpios_locked_mem_valid(&phw-> |
1131 | instream_host_buffers[phm->obj_index])) { | 1096 | instream_host_buffers[phm->obj_index])) { |