sound/pci: coding style fixes: trident
PATCH 21/24 sound/pci: coding style fixes: trident
- <asm/io.h> -> <linux/io.h>
- remove trailing whitespaces
- convert comments
Only compile tested.
Signed-off-by Alexander Beregalov <[email protected]>
---
sound/pci/trident/trident.c | 4 +- sound/pci/trident/trident_main.c | 478 ++++++++++++++++++------------------ sound/pci/trident/trident_memory.c | 12 +- 3 files changed, 247 insertions(+), 247 deletions(-)
sound/pci/trident/trident.c +2 -2
@@ -63,9 +63,9 @@ module_param_array(wavetable_size, int, NULL, 0444);MODULE_PARM_DESC (wavetable_size,"Maximum memory size in kB for wavetable synth." );static struct pci_device_id snd_trident_ids[] = { - {PCI_DEVICE (PCI_VENDOR_ID_TRIDENT ,PCI_DEVICE_ID_TRIDENT_4DWAVE_DX ), + {PCI_DEVICE (PCI_VENDOR_ID_TRIDENT ,PCI_DEVICE_ID_TRIDENT_4DWAVE_DX ),PCI_CLASS_MULTIMEDIA_AUDIO <<8 ,0xffff00 ,0 }, - {PCI_DEVICE (PCI_VENDOR_ID_TRIDENT ,PCI_DEVICE_ID_TRIDENT_4DWAVE_NX ), + {PCI_DEVICE (PCI_VENDOR_ID_TRIDENT ,PCI_DEVICE_ID_TRIDENT_4DWAVE_NX ),0 ,0 ,0 }, {PCI_DEVICE (PCI_VENDOR_ID_SI ,PCI_DEVICE_ID_SI_7018 ),0 ,0 ,0 }, {0 , }
sound/pci/trident/trident_main.c +239 -239
1,279 lines not on this page · raw message
sound/pci/trident/trident_memory.c +6 -6
@@ -23,7 +23,7 @@* */ -#include <asm/io.h> +#include <linux/io.h> #include <linux/pci.h> #include <linux/time.h> #include <linux/mutex.h>
@@ -203,7 +203,7 @@ snd_trident_alloc_sg_pages(struct snd_trident *trident,if (snd_BUG_ON (!hdr))return NULL ; - +mutex_lock (&hdr->block_mutex); blk =search_empty (hdr, runtime->dma_bytes);
@@ -211,7 +211,7 @@ snd_trident_alloc_sg_pages(struct snd_trident *trident,mutex_unlock (&hdr->block_mutex);return NULL ; } - +/* set TLB entries */ idx =0 ;for (page =firstpg (blk); page <=lastpg (blk); page++, idx++) {
@@ -219,7 +219,7 @@ snd_trident_alloc_sg_pages(struct snd_trident *trident,dma_addr_t addr =snd_pcm_sgbuf_get_addr (substream, ofs);unsigned long ptr = (unsigned long )snd_pcm_sgbuf_get_ptr (substream, ofs); -if (!is_valid_page (addr)) { +if (!is_valid_page (addr)) {__snd_util_mem_free (hdr, blk);mutex_unlock (&hdr->block_mutex);return NULL ;
@@ -258,13 +258,13 @@ snd_trident_alloc_cont_pages(struct snd_trident *trident,mutex_unlock (&hdr->block_mutex);return NULL ; } - +/* set TLB entries */ addr = runtime->dma_addr; ptr = (unsigned long )runtime->dma_area;for (page =firstpg (blk); page <=lastpg (blk); page++, ptr +=SNDRV_TRIDENT_PAGE_SIZE , addr +=SNDRV_TRIDENT_PAGE_SIZE ) { -if (!is_valid_page (addr)) { +if (!is_valid_page (addr)) {__snd_util_mem_free (hdr, blk);mutex_unlock (&hdr->block_mutex);return NULL ;