From: Ricardo Cerqueira <v4l@cerqueira.org>
Date: Wed, 9 Nov 2005 05:37:56 +0000 (-0800)
Subject: [PATCH] v4l: 818: cleanup some unnecessary alsa memory (de/)allocations
X-Git-Tag: v3.12-rc1~40720
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e8b23c0238887e1987d82ec0014a7a1fe010e724;p=kernel%2Fkernel-generic.git

[PATCH] v4l: 818: cleanup some unnecessary alsa memory (de/)allocations

- Cleanup some unnecessary ALSA memory (de/)allocations

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index e7c3691..fb6334a 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -512,7 +512,7 @@ static void snd_card_saa7134_runtime_free(snd_pcm_runtime_t *runtime)
  *
  *   Called on initialization, right before the PCM preparation
  *   Usually used in ALSA to allocate the DMA, but since we don't use the
- *  ALSA DMA I'm almost sure this isn't necessary.
+ *  ALSA DMA it does nothing
  *
  */
 
@@ -520,7 +520,7 @@ static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream,
 				    snd_pcm_hw_params_t * hw_params)
 {
 
-	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+	return 0;
 
 
 }
@@ -538,7 +538,7 @@ static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream,
 
 static int snd_card_saa7134_hw_free(snd_pcm_substream_t * substream)
 {
-	return snd_pcm_lib_free_pages(substream);
+	return 0;
 }
 
 /*
@@ -670,9 +670,6 @@ static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
 	pcm->private_data = saa7134;
 	pcm->info_flags = 0;
 	strcpy(pcm->name, "SAA7134 PCM");
-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-					      snd_dma_pci_data(saa7134->pci),
-					      128*1024, 256*1024);
 	return 0;
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 6413a6e..0c74c2f 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -617,8 +617,8 @@ static int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 
 	for (start = 0; start<4; start++) {
 		if (b[start] == 0x80) {
-		        code=b[(start+3)%4];
-		        parity=b[(start+2)%4];
+			code=b[(start+3)%4];
+			parity=b[(start+2)%4];
 		}
 	}