Commit bb59a4c5 authored by Gorskin Ilya's avatar Gorskin Ilya Committed by Greg Kroah-Hartman
Browse files

Staging: cx25821: clenup warnings found by checkpatch.pl tool in... 


Staging: cx25821: clenup warnings found by checkpatch.pl tool in cx25821-audio-upstream.c and cx25821-audio.h.

This is a patch to the cx25821-audio-upstream.c and cx25821-audio.h
that fixes up a warnings found by checkpatch.pl tool.

Signed-off-by: default avatarIlya Gorskin <Revent82@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c6eae677

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

+7 −8
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ MODULE_AUTHOR("Hiep Huynh <hiep.huynh@conexant.com>"); 
MODULE_LICENSE("GPL");



static int _intr_msk =

    FLD_AUD_SRC_RISCI1 | FLD_AUD_SRC_OF | FLD_AUD_SRC_SYNC |

    FLD_AUD_SRC_OPC_ERR;

FLD_AUD_SRC_RISCI1 | FLD_AUD_SRC_OF | FLD_AUD_SRC_SYNC | FLD_AUD_SRC_OPC_ERR;



int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev,

					      struct sram_channel *ch,
@@ -764,9 +763,9 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select) 
		       str_length + 1);



		/* Default if filename is empty string */

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

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

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

		}



	} else {

		str_length = strlen(_defaultAudioName);

		dev->_audiofilename = kmalloc(str_length + 1, GFP_KERNEL);

drivers/staging/cx25821/cx25821-audio.h

+10 −6
Original line number Diff line number Diff line
@@ -31,18 +31,21 @@ 
#define NUMBER_OF_PROGRAMS  8



/*

  Max size of the RISC program for a buffer. - worst case is 2 writes per line

  Space is also added for the 4 no-op instructions added on the end.

* Max size of the RISC program for a buffer. - worst case is 2 writes per line

* Space is also added for the 4 no-op instructions added on the end.

*/

#ifndef USE_RISC_NOOP

#define MAX_BUFFER_PROGRAM_SIZE		\

    (2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE*4)

(2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE +	\

			RISC_WRITECR_INSTRUCTION_SIZE*4)



#endif



/* MAE 12 July 2005 Try to use NOOP RISC instruction instead */

#ifdef USE_RISC_NOOP

#define MAX_BUFFER_PROGRAM_SIZE     \

    (2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE + RISC_NOOP_INSTRUCTION_SIZE*4)

(2*LINES_PER_BUFFER*RISC_WRITE_INSTRUCTION_SIZE + RISC_NOOP_INSTRUCTION_SIZE*4l)



#endif



/* Sizes of various instructions in bytes.  Used when adding instructions. */
@@ -53,6 +56,7 @@ 
#define RISC_WRITECR_INSTRUCTION_SIZE  16

#define RISC_NOOP_INSTRUCTION_SIZE 4



#define MAX_AUDIO_DMA_BUFFER_SIZE (MAX_BUFFER_PROGRAM_SIZE * NUMBER_OF_PROGRAMS + RISC_SYNC_INSTRUCTION_SIZE)

#define MAX_AUDIO_DMA_BUFFER_SIZE	\

(MAX_BUFFER_PROGRAM_SIZE * NUMBER_OF_PROGRAMS + RISC_SYNC_INSTRUCTION_SIZE)



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE