Commit b82cdcca authored by Corentin Labbe's avatar Corentin Labbe Committed by Mauro Carvalho Chehab
Browse files

media: staging: media: zoran: rename debug module parameter 



All zoran module will be merged, so to prevent conflict, the debug
module parameter need to be renamed

Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent b419ee94

drivers/staging/media/zoran/videocodec.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -26,13 +26,13 @@ 




#include "videocodec.h"

#include "videocodec.h"





static int debug;

static int videocodec_debug;

module_param(debug, int, 0);

module_param(videocodec_debug, int, 0);

MODULE_PARM_DESC(debug, "Debug level (0-4)");

MODULE_PARM_DESC(videocodec_debug, "Debug level (0-4)");





#define dprintk(num, format, args...) \

#define dprintk(num, format, args...) \

	do { \

	do { \

		if (debug >= num) \

		if (videocodec_debug >= num) \

			printk(format, ##args); \

			printk(format, ##args); \

	} while (0)

	} while (0)

drivers/staging/media/zoran/zr36016.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -22,14 +22,14 @@ 
/* amount of chips attached via this driver */

/* amount of chips attached via this driver */

static int zr36016_codecs;

static int zr36016_codecs;





/* debugging is available via module parameter */

static int zr36016_debug;

static int debug;

module_param(zr36016_debug, int, 0);

module_param(debug, int, 0);

MODULE_PARM_DESC(zr36016_debug, "Debug level (0-4)");

MODULE_PARM_DESC(debug, "Debug level (0-4)");







#define dprintk(num, format, args...) \

#define dprintk(num, format, args...) \

	do { \

	do { \

		if (debug >= num) \

		if (zr36016_debug >= num) \

			printk(format, ##args); \

			printk(format, ##args); \

	} while (0)

	} while (0)
@@ -120,7 +120,7 @@ static u8 zr36016_read_version(struct zr36016 *ptr) 




static int zr36016_basic_test(struct zr36016 *ptr)

static int zr36016_basic_test(struct zr36016 *ptr)

{

{

	if (debug) {

	if (zr36016_debug) {

		int i;

		int i;





		zr36016_writei(ptr, ZR016I_PAX_LO, 0x55);

		zr36016_writei(ptr, ZR016I_PAX_LO, 0x55);

drivers/staging/media/zoran/zr36050.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -32,13 +32,13 @@ 
static int zr36050_codecs;

static int zr36050_codecs;





/* debugging is available via module parameter */

/* debugging is available via module parameter */

static int debug;

static int zr36050_debug;

module_param(debug, int, 0);

module_param(zr36050_debug, int, 0);

MODULE_PARM_DESC(debug, "Debug level (0-4)");

MODULE_PARM_DESC(zr36050_debug, "Debug level (0-4)");





#define dprintk(num, format, args...) \

#define dprintk(num, format, args...) \

	do { \

	do { \

		if (debug >= num) \

		if (zr36050_debug >= num) \

			printk(format, ##args); \

			printk(format, ##args); \

	} while (0)

	} while (0)

drivers/staging/media/zoran/zr36060.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -34,14 +34,13 @@ static bool low_bitrate; 
module_param(low_bitrate, bool, 0);

module_param(low_bitrate, bool, 0);

MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate");

MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate");





/* debugging is available via module parameter */

static int zr36060_debug;

static int debug;

module_param(zr36060_debug, int, 0);

module_param(debug, int, 0);

MODULE_PARM_DESC(zr36060_debug, "Debug level (0-4)");

MODULE_PARM_DESC(debug, "Debug level (0-4)");





#define dprintk(num, format, args...) \

#define dprintk(num, format, args...) \

	do { \

	do { \

		if (debug >= num) \

		if (zr36060_debug >= num) \

			printk(format, ##args); \

			printk(format, ##args); \

	} while (0)

	} while (0)