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

Commit afabbe6d authored by facugaich's avatar facugaich Committed by Greg Kroah-Hartman
Browse files

Staging: solo6x10: Fix checkpatch errors and most warnings 



This patch fixes all errors and most warnings reported by
checkpatch.pl for all the files in the driver.
v2: Fix a typo and update the patch against the latest HEAD

Signed-off-by: default avatarFacundo Gaich <facugaich@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 16618c20

drivers/staging/solo6x10/solo6010-disp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -203,7 +203,7 @@ static void solo_motion_config(struct solo6010_dev *solo_dev) 
	solo_reg_write(solo_dev, SOLO_VI_MOT_CTRL,

	solo_reg_write(solo_dev, SOLO_VI_MOT_CTRL,

		       SOLO_VI_MOTION_FRAME_COUNT(3) |

		       SOLO_VI_MOTION_FRAME_COUNT(3) |

		       SOLO_VI_MOTION_SAMPLE_LENGTH(solo_dev->video_hsize / 16)

		       SOLO_VI_MOTION_SAMPLE_LENGTH(solo_dev->video_hsize / 16)

		       | //SOLO_VI_MOTION_INTR_START_STOP |

		       | /* SOLO_VI_MOTION_INTR_START_STOP | */

		       SOLO_VI_MOTION_SAMPLE_COUNT(10));

		       SOLO_VI_MOTION_SAMPLE_COUNT(10));





	solo_reg_write(solo_dev, SOLO_VI_MOTION_BORDER, 0);

	solo_reg_write(solo_dev, SOLO_VI_MOTION_BORDER, 0);

drivers/staging/solo6x10/solo6010-enc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "solo6010.h"

#include "solo6010.h"

#include "solo6010-osd-font.h"

#include "solo6010-osd-font.h"





#define CAPTURE_MAX_BANDWIDTH		32	// D1 4channel (D1 == 4)

#define CAPTURE_MAX_BANDWIDTH		32	/* D1 4channel (D1 == 4) */

#define OSG_BUFFER_SIZE			1024

#define OSG_BUFFER_SIZE			1024





#define VI_PROG_HSIZE			(1280 - 16)

#define VI_PROG_HSIZE			(1280 - 16)

drivers/staging/solo6x10/solo6010-g723.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ 
 * is broken down to 20 * 48 byte regions (one for each channel possible)

 * is broken down to 20 * 48 byte regions (one for each channel possible)

 * with the rest of the page being dummy data. */

 * with the rest of the page being dummy data. */

#define MAX_BUFFER		(G723_PERIOD_BYTES * PERIODS_MAX)

#define MAX_BUFFER		(G723_PERIOD_BYTES * PERIODS_MAX)

#define IRQ_PAGES		4 // 0 - 4

#define IRQ_PAGES		4 /* 0 - 4 */

#define PERIODS_MIN		(1 << IRQ_PAGES)

#define PERIODS_MIN		(1 << IRQ_PAGES)

#define PERIODS_MAX		G723_FDMA_PAGES

#define PERIODS_MAX		G723_FDMA_PAGES
@@ -372,10 +372,12 @@ int solo_g723_init(struct solo6010_dev *solo_dev) 
	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	if ((ret = solo_snd_pcm_init(solo_dev)) < 0)

	ret = solo_snd_pcm_init(solo_dev);

	if (ret < 0)

		goto snd_error;

		goto snd_error;





	if ((ret = snd_card_register(card)) < 0)

	ret = snd_card_register(card);

	if (ret < 0)

		goto snd_error;

		goto snd_error;





	solo_g723_config(solo_dev);

	solo_g723_config(solo_dev);

drivers/staging/solo6x10/solo6010-i2c.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -225,7 +225,7 @@ static int solo_i2c_master_xfer(struct i2c_adapter *adap, 
	}

	}





	if (i == SOLO_I2C_ADAPTERS)

	if (i == SOLO_I2C_ADAPTERS)

		return num; // XXX Right return value for failure?

		return num; /* XXX Right return value for failure? */





	mutex_lock(&solo_dev->i2c_mutex);

	mutex_lock(&solo_dev->i2c_mutex);

	solo_dev->i2c_id = i;

	solo_dev->i2c_id = i;
@@ -296,7 +296,8 @@ int solo_i2c_init(struct solo6010_dev *solo_dev) 
		adap->retries = 1;

		adap->retries = 1;

		adap->dev.parent = &solo_dev->pdev->dev;

		adap->dev.parent = &solo_dev->pdev->dev;





		if ((ret = i2c_add_adapter(adap))) {

		ret = i2c_add_adapter(adap);

		if (ret) {

			adap->algo_data = NULL;

			adap->algo_data = NULL;

			break;

			break;

		}

		}

drivers/staging/solo6x10/solo6010-osd-font.h

+30 −30
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 




static const unsigned int solo_osd_font[] = {

static const unsigned int solo_osd_font[] = {

	0x00000000, 0x0000c0c8, 0xccfefe0c, 0x08000000,

	0x00000000, 0x0000c0c8, 0xccfefe0c, 0x08000000,

	0x00000000, 0x10103838, 0x7c7cfefe, 0x00000000,	// 0

	0x00000000, 0x10103838, 0x7c7cfefe, 0x00000000,	/* 0 */

	0x00000000, 0xfefe7c7c, 0x38381010, 0x10000000,

	0x00000000, 0xfefe7c7c, 0x38381010, 0x10000000,

	0x00000000, 0x7c82fefe, 0xfefefe7c, 0x00000000,

	0x00000000, 0x7c82fefe, 0xfefefe7c, 0x00000000,

	0x00000000, 0x00001038, 0x10000000, 0x00000000,

	0x00000000, 0x00001038, 0x10000000, 0x00000000,
@@ -54,67 +54,67 @@ static const unsigned int solo_osd_font[] = { 
	0x0000003f, 0x7f404c52, 0x524c407f, 0x00000000,

	0x0000003f, 0x7f404c52, 0x524c407f, 0x00000000,

	0x0000007c, 0x82ba82ba, 0x82ba82fe, 0x00000000,

	0x0000007c, 0x82ba82ba, 0x82ba82fe, 0x00000000,

	0x00000000, 0x00000000, 0x00000000, 0x00000000,

	0x00000000, 0x00000000, 0x00000000, 0x00000000,

	0x00000000, 0x183c3c3c, 0x18180018, 0x18000000,	// 32   !

	0x00000000, 0x183c3c3c, 0x18180018, 0x18000000,	/* 32   ! */

	0x00000066, 0x66240000, 0x00000000, 0x00000000,

	0x00000066, 0x66240000, 0x00000000, 0x00000000,

	0x00000000, 0x6c6cfe6c, 0x6c6cfe6c, 0x6c000000,	// 34 " #

	0x00000000, 0x6c6cfe6c, 0x6c6cfe6c, 0x6c000000,	/* 34 " # */

	0x00001010, 0x7cd6d616, 0x7cd0d6d6, 0x7c101000,

	0x00001010, 0x7cd6d616, 0x7cd0d6d6, 0x7c101000,

	0x00000000, 0x0086c660, 0x30180cc6, 0xc2000000,	// 36 $ %

	0x00000000, 0x0086c660, 0x30180cc6, 0xc2000000,	/* 36 $ % */

	0x00000000, 0x386c6c38, 0xdc766666, 0xdc000000,

	0x00000000, 0x386c6c38, 0xdc766666, 0xdc000000,

	0x0000000c, 0x0c0c0600, 0x00000000, 0x00000000,	// 38 & '

	0x0000000c, 0x0c0c0600, 0x00000000, 0x00000000,	/* 38 & ' */

	0x00000000, 0x30180c0c, 0x0c0c0c18, 0x30000000,

	0x00000000, 0x30180c0c, 0x0c0c0c18, 0x30000000,

	0x00000000, 0x0c183030, 0x30303018, 0x0c000000,	// 40 ( )

	0x00000000, 0x0c183030, 0x30303018, 0x0c000000,	/* 40 ( ) */

	0x00000000, 0x0000663c, 0xff3c6600, 0x00000000,

	0x00000000, 0x0000663c, 0xff3c6600, 0x00000000,

	0x00000000, 0x00001818, 0x7e181800, 0x00000000,	// 42 * +

	0x00000000, 0x00001818, 0x7e181800, 0x00000000,	/* 42 * + */

	0x00000000, 0x00000000, 0x00000e0e, 0x0c060000,

	0x00000000, 0x00000000, 0x00000e0e, 0x0c060000,

	0x00000000, 0x00000000, 0x7e000000, 0x00000000,	// 44 , -

	0x00000000, 0x00000000, 0x7e000000, 0x00000000,	/* 44 , - */

	0x00000000, 0x00000000, 0x00000006, 0x06000000,

	0x00000000, 0x00000000, 0x00000006, 0x06000000,

	0x00000000, 0x80c06030, 0x180c0602, 0x00000000,	// 46 . /

	0x00000000, 0x80c06030, 0x180c0602, 0x00000000,	/* 46 . / */

	0x0000007c, 0xc6e6f6de, 0xcec6c67c, 0x00000000,

	0x0000007c, 0xc6e6f6de, 0xcec6c67c, 0x00000000,

	0x00000030, 0x383c3030, 0x303030fc, 0x00000000,	// 48 0 1

	0x00000030, 0x383c3030, 0x303030fc, 0x00000000,	/* 48 0 1 */

	0x0000007c, 0xc6c06030, 0x180cc6fe, 0x00000000,

	0x0000007c, 0xc6c06030, 0x180cc6fe, 0x00000000,

	0x0000007c, 0xc6c0c07c, 0xc0c0c67c, 0x00000000,	// 50 2 3

	0x0000007c, 0xc6c0c07c, 0xc0c0c67c, 0x00000000,	/* 50 2 3 */

	0x00000060, 0x70786c66, 0xfe6060f0, 0x00000000,

	0x00000060, 0x70786c66, 0xfe6060f0, 0x00000000,

	0x000000fe, 0x0606067e, 0xc0c0c67c, 0x00000000,	// 52 4 5

	0x000000fe, 0x0606067e, 0xc0c0c67c, 0x00000000,	/* 52 4 5 */

	0x00000038, 0x0c06067e, 0xc6c6c67c, 0x00000000,

	0x00000038, 0x0c06067e, 0xc6c6c67c, 0x00000000,

	0x000000fe, 0xc6c06030, 0x18181818, 0x00000000,	// 54 6 7

	0x000000fe, 0xc6c06030, 0x18181818, 0x00000000,	/* 54 6 7 */

	0x0000007c, 0xc6c6c67c, 0xc6c6c67c, 0x00000000,

	0x0000007c, 0xc6c6c67c, 0xc6c6c67c, 0x00000000,

	0x0000007c, 0xc6c6c6fc, 0xc0c06038, 0x00000000,	// 56 8 9

	0x0000007c, 0xc6c6c6fc, 0xc0c06038, 0x00000000,	/* 56 8 9 */

	0x00000000, 0x18180000, 0x00181800, 0x00000000,

	0x00000000, 0x18180000, 0x00181800, 0x00000000,

	0x00000000, 0x18180000, 0x0018180c, 0x00000000,	// 58 : ;

	0x00000000, 0x18180000, 0x0018180c, 0x00000000,	/* 58 : ; */

	0x00000060, 0x30180c06, 0x0c183060, 0x00000000,

	0x00000060, 0x30180c06, 0x0c183060, 0x00000000,

	0x00000000, 0x007e0000, 0x007e0000, 0x00000000,

	0x00000000, 0x007e0000, 0x007e0000, 0x00000000,

	0x00000006, 0x0c183060, 0x30180c06, 0x00000000,

	0x00000006, 0x0c183060, 0x30180c06, 0x00000000,

	0x0000007c, 0xc6c66030, 0x30003030, 0x00000000,

	0x0000007c, 0xc6c66030, 0x30003030, 0x00000000,

	0x0000007c, 0xc6f6d6d6, 0x7606067c, 0x00000000,

	0x0000007c, 0xc6f6d6d6, 0x7606067c, 0x00000000,

	0x00000010, 0x386cc6c6, 0xfec6c6c6, 0x00000000,	// 64 @ A

	0x00000010, 0x386cc6c6, 0xfec6c6c6, 0x00000000,	/* 64 @ A */

	0x0000007e, 0xc6c6c67e, 0xc6c6c67e, 0x00000000,

	0x0000007e, 0xc6c6c67e, 0xc6c6c67e, 0x00000000,

	0x00000078, 0xcc060606, 0x0606cc78, 0x00000000,	// 66

	0x00000078, 0xcc060606, 0x0606cc78, 0x00000000,	/* 66 */

	0x0000003e, 0x66c6c6c6, 0xc6c6663e, 0x00000000,

	0x0000003e, 0x66c6c6c6, 0xc6c6663e, 0x00000000,

	0x000000fe, 0x0606063e, 0x060606fe, 0x00000000,	// 68

	0x000000fe, 0x0606063e, 0x060606fe, 0x00000000,	/* 68 */

	0x000000fe, 0x0606063e, 0x06060606, 0x00000000,

	0x000000fe, 0x0606063e, 0x06060606, 0x00000000,

	0x00000078, 0xcc060606, 0xf6c6ccb8, 0x00000000,	// 70

	0x00000078, 0xcc060606, 0xf6c6ccb8, 0x00000000,	/* 70 */

	0x000000c6, 0xc6c6c6fe, 0xc6c6c6c6, 0x00000000,

	0x000000c6, 0xc6c6c6fe, 0xc6c6c6c6, 0x00000000,

	0x0000003c, 0x18181818, 0x1818183c, 0x00000000,	// 72

	0x0000003c, 0x18181818, 0x1818183c, 0x00000000,	/* 72 */

	0x00000060, 0x60606060, 0x6066663c, 0x00000000,

	0x00000060, 0x60606060, 0x6066663c, 0x00000000,

	0x000000c6, 0xc666361e, 0x3666c6c6, 0x00000000,	// 74

	0x000000c6, 0xc666361e, 0x3666c6c6, 0x00000000,	/* 74 */

	0x00000006, 0x06060606, 0x060606fe, 0x00000000,

	0x00000006, 0x06060606, 0x060606fe, 0x00000000,

	0x000000c6, 0xeefed6c6, 0xc6c6c6c6, 0x00000000,	// 76

	0x000000c6, 0xeefed6c6, 0xc6c6c6c6, 0x00000000,	/* 76 */

	0x000000c6, 0xcedefef6, 0xe6c6c6c6, 0x00000000,

	0x000000c6, 0xcedefef6, 0xe6c6c6c6, 0x00000000,

	0x00000038, 0x6cc6c6c6, 0xc6c66c38, 0x00000000,	// 78

	0x00000038, 0x6cc6c6c6, 0xc6c66c38, 0x00000000,	/* 78 */

	0x0000007e, 0xc6c6c67e, 0x06060606, 0x00000000,

	0x0000007e, 0xc6c6c67e, 0x06060606, 0x00000000,

	0x00000038, 0x6cc6c6c6, 0xc6d67c38, 0x60000000,	// 80

	0x00000038, 0x6cc6c6c6, 0xc6d67c38, 0x60000000,	/* 80 */

	0x0000007e, 0xc6c6c67e, 0x66c6c6c6, 0x00000000,

	0x0000007e, 0xc6c6c67e, 0x66c6c6c6, 0x00000000,

	0x0000007c, 0xc6c60c38, 0x60c6c67c, 0x00000000,	// 82

	0x0000007c, 0xc6c60c38, 0x60c6c67c, 0x00000000,	/* 82 */

	0x0000007e, 0x18181818, 0x18181818, 0x00000000,

	0x0000007e, 0x18181818, 0x18181818, 0x00000000,

	0x000000c6, 0xc6c6c6c6, 0xc6c6c67c, 0x00000000,	// 84

	0x000000c6, 0xc6c6c6c6, 0xc6c6c67c, 0x00000000,	/* 84 */

	0x000000c6, 0xc6c6c6c6, 0xc66c3810, 0x00000000,

	0x000000c6, 0xc6c6c6c6, 0xc66c3810, 0x00000000,

	0x000000c6, 0xc6c6c6c6, 0xd6d6fe6c, 0x00000000,	// 86

	0x000000c6, 0xc6c6c6c6, 0xd6d6fe6c, 0x00000000,	/* 86 */

	0x000000c6, 0xc6c66c38, 0x6cc6c6c6, 0x00000000,

	0x000000c6, 0xc6c66c38, 0x6cc6c6c6, 0x00000000,

	0x00000066, 0x66666666, 0x3c181818, 0x00000000,	// 88

	0x00000066, 0x66666666, 0x3c181818, 0x00000000,	/* 88 */

	0x000000fe, 0xc0603018, 0x0c0606fe, 0x00000000,

	0x000000fe, 0xc0603018, 0x0c0606fe, 0x00000000,

	0x0000003c, 0x0c0c0c0c, 0x0c0c0c3c, 0x00000000,	// 90

	0x0000003c, 0x0c0c0c0c, 0x0c0c0c3c, 0x00000000,	/* 90 */

	0x00000002, 0x060c1830, 0x60c08000, 0x00000000,

	0x00000002, 0x060c1830, 0x60c08000, 0x00000000,

	0x0000003c, 0x30303030, 0x3030303c, 0x00000000,	// 92

	0x0000003c, 0x30303030, 0x3030303c, 0x00000000,	/* 92 */

	0x00001038, 0x6cc60000, 0x00000000, 0x00000000,

	0x00001038, 0x6cc60000, 0x00000000, 0x00000000,

	0x00000000, 0x00000000, 0x00000000, 0x00fe0000,

	0x00000000, 0x00000000, 0x00000000, 0x00fe0000,

	0x00001818, 0x30000000, 0x00000000, 0x00000000,

	0x00001818, 0x30000000, 0x00000000, 0x00000000,