Skip to contentSkip to conversation

Staging: cx25821: fix coding style issue in cx25821-audio-upstream.h, cx25821-core.c, cx25821-i2c.c, cx25821-medusa-reg.h, cx25821-medusa-video.c

PATCH In review Gorskin Ilya 2 participants 2 messages Sep 3, 2010 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 3/3 Staging: cx25821: fix coding style issue in cx25821-audio-upstream.h, cx25821-core.c, cx25821-i2c.c, cx25821-medusa-reg.h, cx25821-medusa-video.c

This is a patch to the cx25821-audio-upstream.h, cx25821-core.c, cx25821-i2c.c, cx25821-medusa-reg.h, cx25821-medusa-video.c fixed up warnings found by checkpatch.pl tool.

---
 drivers/staging/cx25821/cx25821-audio-upstream.h |    4 +-
 drivers/staging/cx25821/cx25821-core.c           |   51 +++++++++++-----------
 drivers/staging/cx25821/cx25821-i2c.c            |    2 +-
 drivers/staging/cx25821/cx25821-medusa-reg.h     |   12 +++---
 drivers/staging/cx25821/cx25821-medusa-video.c   |   15 +++---
 5 files changed, 41 insertions(+), 43 deletions(-)
drivers/staging/cx25821/cx25821-audio-upstream.h +2 -2
index ca987ad..aeb871e 100644
@@ -46,11 +46,11 @@
 #define USE_RISC_NOOP_AUDIO   1
 
 #ifdef USE_RISC_NOOP_AUDIO
-#define AUDIO_RISC_DMA_BUF_SIZE    ( LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE + RISC_JUMP_INSTRUCTION_SIZE)
+#define AUDIO_RISC_DMA_BUF_SIZE (LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + NUM_NO_OPS*DWORD_SIZE + RISC_JUMP_INSTRUCTION_SIZE)
 #endif
 
 #ifndef USE_RISC_NOOP_AUDIO
-#define AUDIO_RISC_DMA_BUF_SIZE    ( LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + RISC_JUMP_INSTRUCTION_SIZE)
+#define AUDIO_RISC_DMA_BUF_SIZE    (LINES_PER_AUDIO_BUFFER*RISC_READ_INSTRUCTION_SIZE + RISC_WRITECR_INSTRUCTION_SIZE + RISC_JUMP_INSTRUCTION_SIZE)
 #endif
 
 static int _line_size;
drivers/staging/cx25821/cx25821-core.c +25 -26

115 lines not on this page · raw message

drivers/staging/cx25821/cx25821-i2c.c +1 -1
index e43572e..2b14bcc 100644
@@ -283,7 +283,7 @@ static struct i2c_algorithm cx25821_i2c_algo_template = {
 	.master_xfer = i2c_xfer,
 	.functionality = cx25821_functionality,
 #ifdef NEED_ALGO_CONTROL
-       .algo_control = dummy_algo_control,
+	.algo_control = dummy_algo_control,
 #endif
 };
 
drivers/staging/cx25821/cx25821-medusa-reg.h +6 -6
index f7f33b3..cbb05d5 100644
@@ -442,14 +442,14 @@
 
 /*****************************************************************************/
 /* LUMA_CTRL register fields */
-#define VDEC_A_BRITE_CTRL				0x1014
-#define VDEC_A_CNTRST_CTRL       		0x1015
-#define VDEC_A_PEAK_SEL          		0x1016
+#define VDEC_A_BRITE_CTRL			0x1014
+#define VDEC_A_CNTRST_CTRL			0x1015
+#define VDEC_A_PEAK_SEL				0x1016
 
 /*****************************************************************************/
 /* CHROMA_CTRL register fields */
-#define VDEC_A_USAT_CTRL         		0x1018
-#define VDEC_A_VSAT_CTRL         		0x1019
-#define VDEC_A_HUE_CTRL          		0x101A
+#define VDEC_A_USAT_CTRL			0x1018
+#define VDEC_A_VSAT_CTRL			0x1019
+#define VDEC_A_HUE_CTRL				0x101A
 
 #endif
drivers/staging/cx25821/cx25821-medusa-video.c +7 -8
index ef9f2b8..ab2a6d6 100644
@@ -500,8 +500,8 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
 	/* validate the width - cannot be negative */
 	if (width > MAX_WIDTH) {
 		printk
-		    ("cx25821 %s() : width %d > MAX_WIDTH %d ! resetting to MAX_WIDTH\n",
-		     __func__, width, MAX_WIDTH);
+		    ("cx25821 %s() : width %d > MAX_WIDTH %d !
+		    resetting to MAX_WIDTH\n", __func__, width, MAX_WIDTH);
 		width = MAX_WIDTH;
 	}
 
@@ -778,9 +778,9 @@ int medusa_set_saturation(struct cx25821_dev *dev, int saturation, int decoder)
 
 int medusa_video_init(struct cx25821_dev *dev)
 {
-       u32 value = 0, tmp = 0;
-       int ret_val = 0;
-       int i = 0;
+	u32 value = 0, tmp = 0;
+	int ret_val = 0;
+	int i = 0;
 
 	mutex_lock(&dev->lock);
 
@@ -829,9 +829,8 @@ int medusa_video_init(struct cx25821_dev *dev)
 	/* select AFE clock to output mode */
 	value = cx25821_i2c_read(&dev->i2c_bus[0], AFE_AB_DIAG_CTRL, &tmp);
 	value &= 0x83FFFFFF;
-       ret_val =
-	   cx25821_i2c_write(&dev->i2c_bus[0], AFE_AB_DIAG_CTRL,
-			     value | 0x10000000);
+	ret_val = cx25821_i2c_write(&dev->i2c_bus[0], AFE_AB_DIAG_CTRL,
+				value | 0x10000000);
 
 	if (ret_val < 0)
 		goto error;
Signature · 1 line
1.7.2.2
#1 lore raw

drivers/staging/cx25821/cx25821-core.c static int cx25821_dev_setup(struct cx25821_dev *dev) · line 984

Quoted 11 lines · Gorskin Ilya
drivers/staging/cx25821/cx25821-core.c +2 -2
@@ -977,8 +977,8 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
 	dev->lmmio = ioremap(dev->base_io_addr, pci_resource_len(dev->pci, 0));
 
 	if (!dev->lmmio) {
-		CX25821_ERR
-		    ("ioremap failed, maybe increasing __VMALLOC_RESERVE in page.h\n");
+		CX25821_ERR("ioremap failed,
+			    maybe increasing __VMALLOC_RESERVE in page.h\n");
 		cx25821_iounmap(dev);
 		return -ENOMEM;
 	}

You didn't try compile this.

drivers/staging/cx25821/cx25821-medusa-video.c void medusa_set_resolution(struct cx25821_dev *dev, int width, · line 506

Quoted 12 lines
drivers/staging/cx25821/cx25821-medusa-video.c +2 -2
@@ -500,8 +500,8 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
 	/* validate the width - cannot be negative */
 	if (width > MAX_WIDTH) {
 		printk
-		    ("cx25821 %s() : width %d > MAX_WIDTH %d ! resetting to MAX_WIDTH\n",
-		     __func__, width, MAX_WIDTH);
+		    ("cx25821 %s() : width %d > MAX_WIDTH %d !
+		    resetting to MAX_WIDTH\n", __func__, width, MAX_WIDTH);
 		width = MAX_WIDTH;
 	}

The string is damaged here. We don't want those tabs in the final output.

Please look the patch over again and resend. There maybe some other things I missed. Wait a day between writing patches and sending them so that you can review it with fresh eyes.

regards,
dan carpenter