Commit b5f11cc7 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB: cx25821-audio-upstream.c: Fixed some checkpatch.pl warnings/errors 



This patch fixes up some warnings&errors found by the checkpatch.pl script

Signed-off-by: default avatarOlimpiu Pascariu <olimpiu.pascariu@gmail.com>
CC: Palash Bandyopadhyay <palash.bandyopadhyay@conexant.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d72d7c1d

drivers/staging/cx25821/cx25821-audio-upstream.c

+74 −72
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/fcntl.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>



MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards");

MODULE_AUTHOR("Hiep Huynh <hiep.huynh@conexant.com>");
@@ -62,9 +62,8 @@ int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev, 
	cdt = ch->cdt;

	lines = ch->fifo_size / bpl;



	if (lines > 3) {

	if (lines > 3)

		lines = 3;

	}



	BUG_ON(lines < 2);
@@ -84,7 +83,7 @@ int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev, 
	cx_write(ch->cmds_start + 12, AUDIO_CDT_SIZE_QW);

	cx_write(ch->cmds_start + 16, ch->ctrl_start);



	//IQ size

	/* IQ size */

	cx_write(ch->cmds_start + 20, AUDIO_IQ_SIZE_DW);



	for (i = 24; i < 80; i += 4)
@@ -116,8 +115,10 @@ static __le32 *cx25821_risc_field_upstream_audio(struct cx25821_dev *dev, 
		*(rp++) = cpu_to_le32(databuf_phys_addr + offset);

		*(rp++) = cpu_to_le32(0);	/* bits 63-32 */



		// Check if we need to enable the FIFO after the first 3 lines

		// For the upstream audio channel, the risc engine will enable the FIFO.

		/* Check if we need to enable the FIFO

		 * after the first 3 lines.

		 * For the upstream audio channel,

		 * the risc engine will enable the FIFO */

		if (fifo_enable && line == 2) {

			*(rp++) = RISC_WRITECR;

			*(rp++) = sram_ch->dma_ctl;
@@ -160,7 +161,7 @@ int cx25821_risc_buffer_upstream_audio(struct cx25821_dev *dev, 
			risc_flag = RISC_CNT_INC;

		}



		//Calculate physical jump address

		/* Calculate physical jump address */

		if ((frame + 1) == NUM_AUDIO_FRAMES) {

			risc_phys_jump_addr =

			    dev->_risc_phys_start_addr +
@@ -179,17 +180,17 @@ int cx25821_risc_buffer_upstream_audio(struct cx25821_dev *dev, 
						       fifo_enable);



		if (USE_RISC_NOOP_AUDIO) {

			for (i = 0; i < NUM_NO_OPS; i++) {

			for (i = 0; i < NUM_NO_OPS; i++)

				*(rp++) = cpu_to_le32(RISC_NOOP);

		}

		}



		// Loop to (Nth)FrameRISC or to Start of Risc program & generate IRQ

		/* Loop to (Nth)FrameRISC or to Start of Risc program &

		 * generate IRQ */

		*(rp++) = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | risc_flag);

		*(rp++) = cpu_to_le32(risc_phys_jump_addr);

		*(rp++) = cpu_to_le32(0);



		//Recalculate virtual address based on frame index

		/* Recalculate virtual address based on frame index */

		rp = dev->_risc_virt_addr + RISC_SYNC_INSTRUCTION_SIZE / 4 +

		    (AUDIO_RISC_DMA_BUF_SIZE * (frame + 1) / 4);

	}
@@ -220,19 +221,19 @@ void cx25821_stop_upstream_audio(struct cx25821_dev *dev) 
	u32 tmp = 0;



	if (!dev->_audio_is_running) {

		printk

		    ("cx25821: No audio file is currently running so return!\n");

		printk(KERN_DEBUG

		    "cx25821: No audio file is currently running so return!\n");

		return;

	}

	//Disable RISC interrupts

	/* Disable RISC interrupts */

	cx_write(sram_ch->int_msk, 0);



	//Turn OFF risc and fifo enable in AUD_DMA_CNTRL

	/* Turn OFF risc and fifo enable in AUD_DMA_CNTRL */

	tmp = cx_read(sram_ch->dma_ctl);

	cx_write(sram_ch->dma_ctl,

		 tmp & ~(sram_ch->fld_aud_fifo_en | sram_ch->fld_aud_risc_en));



	//Clear data buffer memory

	/* Clear data buffer memory */

	if (dev->_audiodata_buf_virt_addr)

		memset(dev->_audiodata_buf_virt_addr, 0,

		       dev->_audiodata_buf_size);
@@ -253,9 +254,8 @@ void cx25821_stop_upstream_audio(struct cx25821_dev *dev) 


void cx25821_free_mem_upstream_audio(struct cx25821_dev *dev)

{

	if (dev->_audio_is_running) {

	if (dev->_audio_is_running)

		cx25821_stop_upstream_audio(dev);

	}



	cx25821_free_memory_audio(dev);

}
@@ -282,7 +282,7 @@ int cx25821_get_audio_data(struct cx25821_dev *dev, 


	if (IS_ERR(myfile)) {

		const int open_errno = -PTR_ERR(myfile);

		printk("%s(): ERROR opening file(%s) with errno = %d! \n",

		printk(KERN_ERR "%s(): ERROR opening file(%s) with errno = %d!\n",

		       __func__, dev->_audiofilename, open_errno);

		return PTR_ERR(myfile);

	} else {
@@ -347,7 +347,7 @@ static void cx25821_audioups_handler(struct work_struct *work) 
	    container_of(work, struct cx25821_dev, _audio_work_entry);



	if (!dev) {

		printk("ERROR %s(): since container_of(work_struct) FAILED! \n",

		printk(KERN_ERR "ERROR %s(): since container_of(work_struct) FAILED!\n",

		       __func__);

		return;

	}
@@ -373,7 +373,7 @@ int cx25821_openfile_audio(struct cx25821_dev *dev, 


	if (IS_ERR(myfile)) {

		const int open_errno = -PTR_ERR(myfile);

		printk("%s(): ERROR opening file(%s) with errno = %d! \n",

		printk(KERN_ERR "%s(): ERROR opening file(%s) with errno = %d!\n",

		       __func__, dev->_audiofilename, open_errno);

		return PTR_ERR(myfile);

	} else {
@@ -421,14 +421,12 @@ int cx25821_openfile_audio(struct cx25821_dev *dev, 
				}

			}



			if (i > 0) {

			if (i > 0)

				dev->_audioframe_count++;

			}



			if (vfs_read_retval < line_size) {

			if (vfs_read_retval < line_size)

				break;

		}

		}



		dev->_audiofile_status =

		    (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;
@@ -460,14 +458,14 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev, 
	dev->_audiorisc_size = dev->audio_upstream_riscbuf_size;



	if (!dev->_risc_virt_addr) {

		printk

		    ("cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for RISC program! Returning.\n");

		printk(KERN_DEBUG

			"cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for RISC program! Returning.\n");

		return -ENOMEM;

	}

	//Clear out memory at address

	/* Clear out memory at address */

	memset(dev->_risc_virt_addr, 0, dev->_audiorisc_size);



	//For Audio Data buffer allocation

	/* For Audio Data buffer allocation */

	dev->_audiodata_buf_virt_addr =

	    pci_alloc_consistent(dev->pci, dev->audio_upstream_databuf_size,

				 &data_dma_addr);
@@ -475,18 +473,18 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev, 
	dev->_audiodata_buf_size = dev->audio_upstream_databuf_size;



	if (!dev->_audiodata_buf_virt_addr) {

		printk

		    ("cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for data buffer! Returning. \n");

		printk(KERN_DEBUG

			"cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for data buffer! Returning.\n");

		return -ENOMEM;

	}

	//Clear out memory at address

	/* Clear out memory at address */

	memset(dev->_audiodata_buf_virt_addr, 0, dev->_audiodata_buf_size);



	ret = cx25821_openfile_audio(dev, sram_ch);

	if (ret < 0)

		return ret;



	//Creating RISC programs

	/* Creating RISC programs */

	ret =

	    cx25821_risc_buffer_upstream_audio(dev, dev->pci, bpl,

					       dev->_audio_lines_count);
@@ -512,22 +510,22 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num, 
	__le32 *rp;



	if (status & FLD_AUD_SRC_RISCI1) {

		//Get interrupt_index of the program that interrupted

		/* Get interrupt_index of the program that interrupted */

		u32 prog_cnt = cx_read(channel->gpcnt);



		//Since we've identified our IRQ, clear our bits from the interrupt mask and interrupt status registers

		/* Since we've identified our IRQ, clear our bits from the

		 * interrupt mask and interrupt status registers */

		cx_write(channel->int_msk, 0);

		cx_write(channel->int_stat, cx_read(channel->int_stat));



		spin_lock(&dev->slock);



		while (prog_cnt != dev->_last_index_irq) {

			//Update _last_index_irq

			if (dev->_last_index_irq < (NUMBER_OF_PROGRAMS - 1)) {

			/* Update _last_index_irq */

			if (dev->_last_index_irq < (NUMBER_OF_PROGRAMS - 1))

				dev->_last_index_irq++;

			} else {

			else

				dev->_last_index_irq = 0;

			}



			dev->_audioframe_index = dev->_last_index_irq;
@@ -559,7 +557,7 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num, 
						    cpu_to_le32(RISC_NOOP);

					}

				}

				// Jump to 2nd Audio Frame

				/* Jump to 2nd Audio Frame */

				*(rp++) =

				    cpu_to_le32(RISC_JUMP | RISC_IRQ1 |

						RISC_CNT_RESET);
@@ -582,7 +580,8 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num, 
			printk("%s: Audio Received OpCode Error Interrupt!\n",

			       __func__);



		// Read and write back the interrupt status register to clear our bits

		/* Read and write back the interrupt status register to clear

		 * our bits */

		cx_write(channel->int_stat, cx_read(channel->int_stat));

	}
@@ -591,7 +590,7 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num, 
		       dev->_audioframe_count);

		return -1;

	}

	//ElSE, set the interrupt mask register, re-enable irq.

	/* ElSE, set the interrupt mask register, re-enable irq. */

	int_msk_tmp = cx_read(channel->int_msk);

	cx_write(channel->int_msk, int_msk_tmp |= _intr_msk);
@@ -613,7 +612,7 @@ static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id) 
	msk_stat = cx_read(sram_ch->int_mstat);

	audio_status = cx_read(sram_ch->int_stat);



	// Only deal with our interrupt

	/* Only deal with our interrupt */

	if (audio_status) {

		handled =

		    cx25821_audio_upstream_irq(dev,
@@ -622,11 +621,10 @@ static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id) 
					       audio_status);

	}



	if (handled < 0) {

	if (handled < 0)

		cx25821_stop_upstream_audio(dev);

	} else {

	else

		handled += handled;

	}



	return IRQ_RETVAL(handled);

}
@@ -638,13 +636,14 @@ static void cx25821_wait_fifo_enable(struct cx25821_dev *dev, 
	u32 tmp;



	do {

		//Wait 10 microsecond before checking to see if the FIFO is turned ON.

		/* Wait 10 microsecond before checking to see if the FIFO is

		 * turned ON. */

		udelay(10);



		tmp = cx_read(sram_ch->dma_ctl);



		if (count++ > 1000)	//10 millisecond timeout

		{

		/* 10 millisecond timeout */

		if (count++ > 1000) {

			printk

			    ("cx25821 ERROR: %s() fifo is NOT turned on. Timeout!\n",

			     __func__);
@@ -661,31 +660,34 @@ int cx25821_start_audio_dma_upstream(struct cx25821_dev *dev, 
	u32 tmp = 0;

	int err = 0;



	// Set the physical start address of the RISC program in the initial program counter(IPC) member of the CMDS.

	/* Set the physical start address of the RISC program in the initial

	 * program counter(IPC) member of the CMDS. */

	cx_write(sram_ch->cmds_start + 0, dev->_risc_phys_addr);

	cx_write(sram_ch->cmds_start + 4, 0);	/* Risc IPC High 64 bits 63-32 */

	/* Risc IPC High 64 bits 63-32 */

	cx_write(sram_ch->cmds_start + 4, 0);



	/* reset counter */

	cx_write(sram_ch->gpcnt_ctl, 3);



	//Set the line length       (It looks like we do not need to set the line length)

	/* Set the line length       (It looks like we do not need to set the

	 * line length) */

	cx_write(sram_ch->aud_length, AUDIO_LINE_SIZE & FLD_AUD_DST_LN_LNGTH);



	//Set the input mode to 16-bit

	/* Set the input mode to 16-bit */

	tmp = cx_read(sram_ch->aud_cfg);

	tmp |=

	    FLD_AUD_SRC_ENABLE | FLD_AUD_DST_PK_MODE | FLD_AUD_CLK_ENABLE |

	    FLD_AUD_MASTER_MODE | FLD_AUD_CLK_SELECT_PLL_D | FLD_AUD_SONY_MODE;

	cx_write(sram_ch->aud_cfg, tmp);



	// Read and write back the interrupt status register to clear it

	/* Read and write back the interrupt status register to clear it */

	tmp = cx_read(sram_ch->int_stat);

	cx_write(sram_ch->int_stat, tmp);



	// Clear our bits from the interrupt status register.

	/* Clear our bits from the interrupt status register. */

	cx_write(sram_ch->int_stat, _intr_msk);



	//Set the interrupt mask register, enable irq.

	/* Set the interrupt mask register, enable irq. */

	cx_set(PCI_INT_MSK, cx_read(PCI_INT_MSK) | (1 << sram_ch->irq_bit));

	tmp = cx_read(sram_ch->int_msk);

	cx_write(sram_ch->int_msk, tmp |= _intr_msk);
@@ -699,14 +701,14 @@ int cx25821_start_audio_dma_upstream(struct cx25821_dev *dev, 
		goto fail_irq;

	}



	// Start the DMA  engine

	/* Start the DMA  engine */

	tmp = cx_read(sram_ch->dma_ctl);

	cx_set(sram_ch->dma_ctl, tmp | sram_ch->fld_aud_risc_en);



	dev->_audio_is_running = 1;

	dev->_is_first_audio_frame = 1;



	// The fifo_en bit turns on by the first Risc program

	/* The fifo_en bit turns on by the first Risc program */

	cx25821_wait_fifo_enable(dev, sram_ch);



	return 0;
@@ -731,14 +733,14 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) 
	dev->_audio_upstream_channel_select = channel_select;

	sram_ch = &dev->sram_channels[channel_select];



	//Work queue

	/* Work queue */

	INIT_WORK(&dev->_audio_work_entry, cx25821_audioups_handler);

	dev->_irq_audio_queues =

	    create_singlethread_workqueue("cx25821_audioworkqueue");



	if (!dev->_irq_audio_queues) {

		printk

		    ("cx25821 ERROR: create_singlethread_workqueue() for Audio FAILED!\n");

		printk(KERN_DEBUG

			"cx25821 ERROR: create_singlethread_workqueue() for Audio FAILED!\n");

		return -ENOMEM;

	}
@@ -760,7 +762,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) 
		memcpy(dev->_audiofilename, dev->input_audiofilename,

		       str_length + 1);



		//Default if filename is empty string

		/* Default if filename is empty string */

		if (strcmp(dev->input_audiofilename, "") == 0) {

			dev->_audiofilename = "/root/audioGOOD.wav";

		}
@@ -784,7 +786,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) 
	    RISC_SYNC_INSTRUCTION_SIZE;

	dev->audio_upstream_databuf_size = AUDIO_DATA_BUF_SZ * NUM_AUDIO_PROGS;



	//Allocating buffers and prepare RISC program

	/* Allocating buffers and prepare RISC program */

	retval =

	    cx25821_audio_upstream_buffer_prepare(dev, sram_ch, _line_size);

	if (retval < 0) {
@@ -793,7 +795,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) 
		       dev->name);

		goto error;

	}

	//Start RISC engine

	/* Start RISC engine */

	cx25821_start_audio_dma_upstream(dev, sram_ch);



	return 0;