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

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

[media] tvp5150: Get rid of direct calls to printk() 



When returning results via v4l2_subdev_core_ops.log_status,
use dev_foo() call, instead of just calling printk()
directly, without even specifying the log message level.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 257e29f8

drivers/media/i2c/tvp5150.c

+110 −108
Original line number Original line Diff line number Diff line
@@ -36,6 +36,8 @@ static int debug; 
module_param(debug, int, 0644);

module_param(debug, int, 0644);

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

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





#define dprintk0(__dev, __arg...) dev_dbg_lvl(__dev, 0, 0, __arg)



struct tvp5150 {

struct tvp5150 {

	struct v4l2_subdev sd;

	struct v4l2_subdev sd;

#ifdef CONFIG_MEDIA_CONTROLLER

#ifdef CONFIG_MEDIA_CONTROLLER
@@ -118,82 +120,82 @@ static void dump_reg_range(struct v4l2_subdev *sd, char *s, u8 init, 




static int tvp5150_log_status(struct v4l2_subdev *sd)

static int tvp5150_log_status(struct v4l2_subdev *sd)

{

{

	printk("tvp5150: Video input source selection #1 = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Video input source selection #1 = 0x%02x\n",

		tvp5150_read(sd, TVP5150_VD_IN_SRC_SEL_1));

		tvp5150_read(sd, TVP5150_VD_IN_SRC_SEL_1));

	printk("tvp5150: Analog channel controls = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Analog channel controls = 0x%02x\n",

		tvp5150_read(sd, TVP5150_ANAL_CHL_CTL));

		tvp5150_read(sd, TVP5150_ANAL_CHL_CTL));

	printk("tvp5150: Operation mode controls = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Operation mode controls = 0x%02x\n",

		tvp5150_read(sd, TVP5150_OP_MODE_CTL));

		tvp5150_read(sd, TVP5150_OP_MODE_CTL));

	printk("tvp5150: Miscellaneous controls = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Miscellaneous controls = 0x%02x\n",

		tvp5150_read(sd, TVP5150_MISC_CTL));

		tvp5150_read(sd, TVP5150_MISC_CTL));

	printk("tvp5150: Autoswitch mask= 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Autoswitch mask= 0x%02x\n",

		tvp5150_read(sd, TVP5150_AUTOSW_MSK));

		tvp5150_read(sd, TVP5150_AUTOSW_MSK));

	printk("tvp5150: Color killer threshold control = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Color killer threshold control = 0x%02x\n",

		tvp5150_read(sd, TVP5150_COLOR_KIL_THSH_CTL));

		tvp5150_read(sd, TVP5150_COLOR_KIL_THSH_CTL));

	printk("tvp5150: Luminance processing controls #1 #2 and #3 = %02x %02x %02x\n",

	dprintk0(sd->dev, "tvp5150: Luminance processing controls #1 #2 and #3 = %02x %02x %02x\n",

		tvp5150_read(sd, TVP5150_LUMA_PROC_CTL_1),

		tvp5150_read(sd, TVP5150_LUMA_PROC_CTL_1),

		tvp5150_read(sd, TVP5150_LUMA_PROC_CTL_2),

		tvp5150_read(sd, TVP5150_LUMA_PROC_CTL_2),

		tvp5150_read(sd, TVP5150_LUMA_PROC_CTL_3));

		tvp5150_read(sd, TVP5150_LUMA_PROC_CTL_3));

	printk("tvp5150: Brightness control = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Brightness control = 0x%02x\n",

		tvp5150_read(sd, TVP5150_BRIGHT_CTL));

		tvp5150_read(sd, TVP5150_BRIGHT_CTL));

	printk("tvp5150: Color saturation control = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Color saturation control = 0x%02x\n",

		tvp5150_read(sd, TVP5150_SATURATION_CTL));

		tvp5150_read(sd, TVP5150_SATURATION_CTL));

	printk("tvp5150: Hue control = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Hue control = 0x%02x\n",

		tvp5150_read(sd, TVP5150_HUE_CTL));

		tvp5150_read(sd, TVP5150_HUE_CTL));

	printk("tvp5150: Contrast control = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Contrast control = 0x%02x\n",

		tvp5150_read(sd, TVP5150_CONTRAST_CTL));

		tvp5150_read(sd, TVP5150_CONTRAST_CTL));

	printk("tvp5150: Outputs and data rates select = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Outputs and data rates select = 0x%02x\n",

		tvp5150_read(sd, TVP5150_DATA_RATE_SEL));

		tvp5150_read(sd, TVP5150_DATA_RATE_SEL));

	printk("tvp5150: Configuration shared pins = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Configuration shared pins = 0x%02x\n",

		tvp5150_read(sd, TVP5150_CONF_SHARED_PIN));

		tvp5150_read(sd, TVP5150_CONF_SHARED_PIN));

	printk("tvp5150: Active video cropping start = 0x%02x%02x\n",

	dprintk0(sd->dev, "tvp5150: Active video cropping start = 0x%02x%02x\n",

		tvp5150_read(sd, TVP5150_ACT_VD_CROP_ST_MSB),

		tvp5150_read(sd, TVP5150_ACT_VD_CROP_ST_MSB),

		tvp5150_read(sd, TVP5150_ACT_VD_CROP_ST_LSB));

		tvp5150_read(sd, TVP5150_ACT_VD_CROP_ST_LSB));

	printk("tvp5150: Active video cropping stop  = 0x%02x%02x\n",

	dprintk0(sd->dev, "tvp5150: Active video cropping stop  = 0x%02x%02x\n",

		tvp5150_read(sd, TVP5150_ACT_VD_CROP_STP_MSB),

		tvp5150_read(sd, TVP5150_ACT_VD_CROP_STP_MSB),

		tvp5150_read(sd, TVP5150_ACT_VD_CROP_STP_LSB));

		tvp5150_read(sd, TVP5150_ACT_VD_CROP_STP_LSB));

	printk("tvp5150: Genlock/RTC = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Genlock/RTC = 0x%02x\n",

		tvp5150_read(sd, TVP5150_GENLOCK));

		tvp5150_read(sd, TVP5150_GENLOCK));

	printk("tvp5150: Horizontal sync start = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Horizontal sync start = 0x%02x\n",

		tvp5150_read(sd, TVP5150_HORIZ_SYNC_START));

		tvp5150_read(sd, TVP5150_HORIZ_SYNC_START));

	printk("tvp5150: Vertical blanking start = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Vertical blanking start = 0x%02x\n",

		tvp5150_read(sd, TVP5150_VERT_BLANKING_START));

		tvp5150_read(sd, TVP5150_VERT_BLANKING_START));

	printk("tvp5150: Vertical blanking stop = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Vertical blanking stop = 0x%02x\n",

		tvp5150_read(sd, TVP5150_VERT_BLANKING_STOP));

		tvp5150_read(sd, TVP5150_VERT_BLANKING_STOP));

	printk("tvp5150: Chrominance processing control #1 and #2 = %02x %02x\n",

	dprintk0(sd->dev, "tvp5150: Chrominance processing control #1 and #2 = %02x %02x\n",

		tvp5150_read(sd, TVP5150_CHROMA_PROC_CTL_1),

		tvp5150_read(sd, TVP5150_CHROMA_PROC_CTL_1),

		tvp5150_read(sd, TVP5150_CHROMA_PROC_CTL_2));

		tvp5150_read(sd, TVP5150_CHROMA_PROC_CTL_2));

	printk("tvp5150: Interrupt reset register B = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Interrupt reset register B = 0x%02x\n",

		tvp5150_read(sd, TVP5150_INT_RESET_REG_B));

		tvp5150_read(sd, TVP5150_INT_RESET_REG_B));

	printk("tvp5150: Interrupt enable register B = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Interrupt enable register B = 0x%02x\n",

		tvp5150_read(sd, TVP5150_INT_ENABLE_REG_B));

		tvp5150_read(sd, TVP5150_INT_ENABLE_REG_B));

	printk("tvp5150: Interrupt configuration register B = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Interrupt configuration register B = 0x%02x\n",

		tvp5150_read(sd, TVP5150_INTT_CONFIG_REG_B));

		tvp5150_read(sd, TVP5150_INTT_CONFIG_REG_B));

	printk("tvp5150: Video standard = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Video standard = 0x%02x\n",

		tvp5150_read(sd, TVP5150_VIDEO_STD));

		tvp5150_read(sd, TVP5150_VIDEO_STD));

	printk("tvp5150: Chroma gain factor: Cb=0x%02x Cr=0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Chroma gain factor: Cb=0x%02x Cr=0x%02x\n",

		tvp5150_read(sd, TVP5150_CB_GAIN_FACT),

		tvp5150_read(sd, TVP5150_CB_GAIN_FACT),

		tvp5150_read(sd, TVP5150_CR_GAIN_FACTOR));

		tvp5150_read(sd, TVP5150_CR_GAIN_FACTOR));

	printk("tvp5150: Macrovision on counter = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Macrovision on counter = 0x%02x\n",

		tvp5150_read(sd, TVP5150_MACROVISION_ON_CTR));

		tvp5150_read(sd, TVP5150_MACROVISION_ON_CTR));

	printk("tvp5150: Macrovision off counter = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Macrovision off counter = 0x%02x\n",

		tvp5150_read(sd, TVP5150_MACROVISION_OFF_CTR));

		tvp5150_read(sd, TVP5150_MACROVISION_OFF_CTR));

	printk("tvp5150: ITU-R BT.656.%d timing(TVP5150AM1 only)\n",

	dprintk0(sd->dev, "tvp5150: ITU-R BT.656.%d timing(TVP5150AM1 only)\n",

		(tvp5150_read(sd, TVP5150_REV_SELECT) & 1) ? 3 : 4);

		(tvp5150_read(sd, TVP5150_REV_SELECT) & 1) ? 3 : 4);

	printk("tvp5150: Device ID = %02x%02x\n",

	dprintk0(sd->dev, "tvp5150: Device ID = %02x%02x\n",

		tvp5150_read(sd, TVP5150_MSB_DEV_ID),

		tvp5150_read(sd, TVP5150_MSB_DEV_ID),

		tvp5150_read(sd, TVP5150_LSB_DEV_ID));

		tvp5150_read(sd, TVP5150_LSB_DEV_ID));

	printk("tvp5150: ROM version = (hex) %02x.%02x\n",

	dprintk0(sd->dev, "tvp5150: ROM version = (hex) %02x.%02x\n",

		tvp5150_read(sd, TVP5150_ROM_MAJOR_VER),

		tvp5150_read(sd, TVP5150_ROM_MAJOR_VER),

		tvp5150_read(sd, TVP5150_ROM_MINOR_VER));

		tvp5150_read(sd, TVP5150_ROM_MINOR_VER));

	printk("tvp5150: Vertical line count = 0x%02x%02x\n",

	dprintk0(sd->dev, "tvp5150: Vertical line count = 0x%02x%02x\n",

		tvp5150_read(sd, TVP5150_VERT_LN_COUNT_MSB),

		tvp5150_read(sd, TVP5150_VERT_LN_COUNT_MSB),

		tvp5150_read(sd, TVP5150_VERT_LN_COUNT_LSB));

		tvp5150_read(sd, TVP5150_VERT_LN_COUNT_LSB));

	printk("tvp5150: Interrupt status register B = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Interrupt status register B = 0x%02x\n",

		tvp5150_read(sd, TVP5150_INT_STATUS_REG_B));

		tvp5150_read(sd, TVP5150_INT_STATUS_REG_B));

	printk("tvp5150: Interrupt active register B = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Interrupt active register B = 0x%02x\n",

		tvp5150_read(sd, TVP5150_INT_ACTIVE_REG_B));

		tvp5150_read(sd, TVP5150_INT_ACTIVE_REG_B));

	printk("tvp5150: Status regs #1 to #5 = %02x %02x %02x %02x %02x\n",

	dprintk0(sd->dev, "tvp5150: Status regs #1 to #5 = %02x %02x %02x %02x %02x\n",

		tvp5150_read(sd, TVP5150_STATUS_REG_1),

		tvp5150_read(sd, TVP5150_STATUS_REG_1),

		tvp5150_read(sd, TVP5150_STATUS_REG_2),

		tvp5150_read(sd, TVP5150_STATUS_REG_2),

		tvp5150_read(sd, TVP5150_STATUS_REG_3),

		tvp5150_read(sd, TVP5150_STATUS_REG_3),
@@ -205,32 +207,32 @@ static int tvp5150_log_status(struct v4l2_subdev *sd) 
	dump_reg_range(sd, "Teletext filter 2",   TVP5150_TELETEXT_FIL2_INI,

	dump_reg_range(sd, "Teletext filter 2",   TVP5150_TELETEXT_FIL2_INI,

			TVP5150_TELETEXT_FIL2_END, 8);

			TVP5150_TELETEXT_FIL2_END, 8);





	printk("tvp5150: Teletext filter enable = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Teletext filter enable = 0x%02x\n",

		tvp5150_read(sd, TVP5150_TELETEXT_FIL_ENA));

		tvp5150_read(sd, TVP5150_TELETEXT_FIL_ENA));

	printk("tvp5150: Interrupt status register A = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Interrupt status register A = 0x%02x\n",

		tvp5150_read(sd, TVP5150_INT_STATUS_REG_A));

		tvp5150_read(sd, TVP5150_INT_STATUS_REG_A));

	printk("tvp5150: Interrupt enable register A = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Interrupt enable register A = 0x%02x\n",

		tvp5150_read(sd, TVP5150_INT_ENABLE_REG_A));

		tvp5150_read(sd, TVP5150_INT_ENABLE_REG_A));

	printk("tvp5150: Interrupt configuration = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Interrupt configuration = 0x%02x\n",

		tvp5150_read(sd, TVP5150_INT_CONF));

		tvp5150_read(sd, TVP5150_INT_CONF));

	printk("tvp5150: VDP status register = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: VDP status register = 0x%02x\n",

		tvp5150_read(sd, TVP5150_VDP_STATUS_REG));

		tvp5150_read(sd, TVP5150_VDP_STATUS_REG));

	printk("tvp5150: FIFO word count = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: FIFO word count = 0x%02x\n",

		tvp5150_read(sd, TVP5150_FIFO_WORD_COUNT));

		tvp5150_read(sd, TVP5150_FIFO_WORD_COUNT));

	printk("tvp5150: FIFO interrupt threshold = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: FIFO interrupt threshold = 0x%02x\n",

		tvp5150_read(sd, TVP5150_FIFO_INT_THRESHOLD));

		tvp5150_read(sd, TVP5150_FIFO_INT_THRESHOLD));

	printk("tvp5150: FIFO reset = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: FIFO reset = 0x%02x\n",

		tvp5150_read(sd, TVP5150_FIFO_RESET));

		tvp5150_read(sd, TVP5150_FIFO_RESET));

	printk("tvp5150: Line number interrupt = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Line number interrupt = 0x%02x\n",

		tvp5150_read(sd, TVP5150_LINE_NUMBER_INT));

		tvp5150_read(sd, TVP5150_LINE_NUMBER_INT));

	printk("tvp5150: Pixel alignment register = 0x%02x%02x\n",

	dprintk0(sd->dev, "tvp5150: Pixel alignment register = 0x%02x%02x\n",

		tvp5150_read(sd, TVP5150_PIX_ALIGN_REG_HIGH),

		tvp5150_read(sd, TVP5150_PIX_ALIGN_REG_HIGH),

		tvp5150_read(sd, TVP5150_PIX_ALIGN_REG_LOW));

		tvp5150_read(sd, TVP5150_PIX_ALIGN_REG_LOW));

	printk("tvp5150: FIFO output control = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: FIFO output control = 0x%02x\n",

		tvp5150_read(sd, TVP5150_FIFO_OUT_CTRL));

		tvp5150_read(sd, TVP5150_FIFO_OUT_CTRL));

	printk("tvp5150: Full field enable = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Full field enable = 0x%02x\n",

		tvp5150_read(sd, TVP5150_FULL_FIELD_ENA));

		tvp5150_read(sd, TVP5150_FULL_FIELD_ENA));

	printk("tvp5150: Full field mode register = 0x%02x\n",

	dprintk0(sd->dev, "tvp5150: Full field mode register = 0x%02x\n",

		tvp5150_read(sd, TVP5150_FULL_FIELD_MODE_REG));

		tvp5150_read(sd, TVP5150_FULL_FIELD_MODE_REG));





	dump_reg_range(sd, "CC   data",   TVP5150_CC_DATA_INI,

	dump_reg_range(sd, "CC   data",   TVP5150_CC_DATA_INI,