Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 112ac808 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Takashi Iwai
Browse files

ALSA: sound/ps3: Fix checkpatch issues 



Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 07a2039b

sound/ppc/snd_ps3.c

+15 −17
Original line number Original line Diff line number Diff line
@@ -165,8 +165,7 @@ static const struct snd_pcm_hardware snd_ps3_pcm_hw = { 
	.fifo_size = PS3_AUDIO_FIFO_SIZE

	.fifo_size = PS3_AUDIO_FIFO_SIZE

};

};





static struct snd_pcm_ops snd_ps3_pcm_spdif_ops =

static struct snd_pcm_ops snd_ps3_pcm_spdif_ops = {

{

	.open = snd_ps3_pcm_open,

	.open = snd_ps3_pcm_open,

	.close = snd_ps3_pcm_close,

	.close = snd_ps3_pcm_close,

	.prepare = snd_ps3_pcm_prepare,

	.prepare = snd_ps3_pcm_prepare,
@@ -259,9 +258,7 @@ static void snd_ps3_kick_dma(struct snd_ps3_card_info *card) 
/*

/*

 * convert virtual addr to ioif bus addr.

 * convert virtual addr to ioif bus addr.

 */

 */

static dma_addr_t v_to_bus(struct snd_ps3_card_info *card,

static dma_addr_t v_to_bus(struct snd_ps3_card_info *card, void *paddr, int ch)

			   void * paddr,

			   int ch)

{

{

	return card->dma_start_bus_addr[ch] +

	return card->dma_start_bus_addr[ch] +

		(paddr - card->dma_start_vaddr[ch]);

		(paddr - card->dma_start_vaddr[ch]);
@@ -1020,11 +1017,12 @@ static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev) 
	 * its size should be lager than PS3_AUDIO_FIFO_STAGE_SIZE * 2

	 * its size should be lager than PS3_AUDIO_FIFO_STAGE_SIZE * 2

	 * PAGE_SIZE is enogh

	 * PAGE_SIZE is enogh

	 */

	 */

	if (!(the_card.null_buffer_start_vaddr =

	the_card.null_buffer_start_vaddr =

		dma_alloc_coherent(&the_card.ps3_dev->core,

		dma_alloc_coherent(&the_card.ps3_dev->core,

				   PAGE_SIZE,

				   PAGE_SIZE,

				   &the_card.null_buffer_start_dma_addr,

				   &the_card.null_buffer_start_dma_addr,

				 GFP_KERNEL))) {

				   GFP_KERNEL);

	if (!the_card.null_buffer_start_vaddr) {

		pr_info("%s: nullbuffer alloc failed\n", __func__);

		pr_info("%s: nullbuffer alloc failed\n", __func__);

		goto clean_preallocate;

		goto clean_preallocate;

	}

	}