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

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

[media] cx231xx: Cleanup printk at the driver 



There are lots of debug printks printed with pr_info. Also, the
printk's data are not too coherent:

- there are duplicated driver name at the print format;
- function name format string differs from function to function;
- long strings broken into multiple lines;
- some printks just produce ugly reports, being almost useless
  as-is.

Do a cleanup on that.

Still, there are much to be done in order to do a better printk
job on this driver, but, at least it will now be a way less
verbose, if debug printks are disabled, and some logs might
actually be useful.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 88538bb5

drivers/media/usb/cx231xx/cx231xx-417.c

+7 −8
Original line number Diff line number Diff line
@@ -91,9 +91,9 @@ module_param(v4l_debug, int, 0644); 
MODULE_PARM_DESC(v4l_debug, "enable V4L debug messages");



#define dprintk(level, fmt, arg...)	\

	do { if (v4l_debug >= level) \

		pr_info("%s: " fmt, \

		(dev) ? dev->name : "cx231xx[?]", ## arg); \

	do {				\

		if (v4l_debug >= level) \

			printk(KERN_DEBUG pr_fmt(fmt), ## arg); \

	} while (0)



static struct cx231xx_tvnorm cx231xx_tvnorms[] = {
@@ -1114,15 +1114,15 @@ static int cx231xx_initialize_codec(struct cx231xx *dev) 
	cx231xx_disable656(dev);

	retval = cx231xx_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0); /* ping */

	if (retval < 0) {

		dprintk(2, "%s() PING OK\n", __func__);

		dprintk(2, "%s: PING OK\n", __func__);

		retval = cx231xx_load_firmware(dev);

		if (retval < 0) {

			pr_err("%s() f/w load failed\n", __func__);

			pr_err("%s: f/w load failed\n", __func__);

			return retval;

		}

		retval = cx231xx_find_mailbox(dev);

		if (retval < 0) {

			pr_err("%s() mailbox < 0, error\n",

			pr_err("%s: mailbox < 0, error\n",

				__func__);

			return -1;

		}
@@ -1798,7 +1798,6 @@ static unsigned int mpeg_poll(struct file *file, 
static int mpeg_mmap(struct file *file, struct vm_area_struct *vma)

{

	struct cx231xx_fh *fh = file->private_data;

	struct cx231xx *dev = fh->dev;



	dprintk(2, "%s()\n", __func__);

drivers/media/usb/cx231xx/cx231xx-audio.c

+8 −12
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev) 
	int i, errCode;

	int sb_size;



	pr_info("%s: Starting ISO AUDIO transfers\n", __func__);

	pr_debug("%s: Starting ISO AUDIO transfers\n", __func__);



	if (dev->state & DEV_DISCONNECTED)

		return -ENODEV;
@@ -338,7 +338,7 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev) 
	int i, errCode;

	int sb_size;



	pr_info("%s: Starting BULK AUDIO transfers\n", __func__);

	pr_debug("%s: Starting BULK AUDIO transfers\n", __func__);



	if (dev->state & DEV_DISCONNECTED)

		return -ENODEV;
@@ -439,8 +439,7 @@ static int snd_cx231xx_capture_open(struct snd_pcm_substream *substream) 
	dprintk("opening device and trying to acquire exclusive lock\n");



	if (!dev) {

		pr_err("BUG: cx231xx can't find device struct."

			       " Can't proceed with open\n");

		pr_err("BUG: cx231xx can't find device struct. Can't proceed with open\n");

		return -ENODEV;

	}
@@ -662,8 +661,7 @@ static int cx231xx_audio_init(struct cx231xx *dev) 
		return 0;

	}



	pr_info("cx231xx-audio.c: probing for cx231xx "

		     "non standard usbaudio\n");

	pr_debug("probing for cx231xx non standard usbaudio\n");



	err = snd_card_new(&dev->udev->dev, index[devnr], "Cx231xx Audio",

			   THIS_MODULE, 0, &card);
@@ -707,14 +705,12 @@ static int cx231xx_audio_init(struct cx231xx *dev) 
			bEndpointAddress;



	adev->num_alt = uif->num_altsetting;

	pr_info("EndPoint Addr 0x%x, Alternate settings: %i\n",

	pr_info("audio EndPoint Addr 0x%x, Alternate settings: %i\n",

		adev->end_point_addr, adev->num_alt);

	adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);



	if (adev->alt_max_pkt_size == NULL) {

		pr_err("out of memory!\n");

	if (adev->alt_max_pkt_size == NULL)

		return -ENOMEM;

	}



	for (i = 0; i < adev->num_alt; i++) {

		u16 tmp =
@@ -722,7 +718,7 @@ static int cx231xx_audio_init(struct cx231xx *dev) 
				wMaxPacketSize);

		adev->alt_max_pkt_size[i] =

		    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);

		pr_info("Alternate setting %i, max size= %i\n", i,

		pr_debug("audio alternate setting %i, max size= %i\n", i,

			     adev->alt_max_pkt_size[i]);

	}

drivers/media/usb/cx231xx/cx231xx-avcore.c

+68 −74
Original line number Diff line number Diff line
@@ -83,10 +83,10 @@ void initGPIO(struct cx231xx *dev) 
	cx231xx_send_gpio_cmd(dev, _gpio_direction, (u8 *)&value, 4, 0, 0);



	verve_read_byte(dev, 0x07, &val);

	pr_info(" verve_read_byte address0x07=0x%x\n", val);

	pr_debug("verve_read_byte address0x07=0x%x\n", val);

	verve_write_byte(dev, 0x07, 0xF4);

	verve_read_byte(dev, 0x07, &val);

	pr_info(" verve_read_byte address0x07=0x%x\n", val);

	pr_debug("verve_read_byte address0x07=0x%x\n", val);



	cx231xx_capture_start(dev, 1, Vbi);
@@ -156,22 +156,22 @@ int cx231xx_afe_init_super_block(struct cx231xx *dev, u32 ref_count) 
	while (afe_power_status != 0x18) {

		status = afe_write_byte(dev, SUP_BLK_PWRDN, 0x18);

		if (status < 0) {

			pr_info(

			": Init Super Block failed in send cmd\n");

			pr_debug("%s: Init Super Block failed in send cmd\n",

				__func__);

			break;

		}



		status = afe_read_byte(dev, SUP_BLK_PWRDN, &afe_power_status);

		afe_power_status &= 0xff;

		if (status < 0) {

			pr_info(

			": Init Super Block failed in receive cmd\n");

			pr_debug("%s: Init Super Block failed in receive cmd\n",

				__func__);

			break;

		}

		i++;

		if (i == 10) {

			pr_info(

			": Init Super Block force break in loop !!!!\n");

			pr_debug("%s: Init Super Block force break in loop !!!!\n",

				__func__);

			status = -1;

			break;

		}
@@ -410,7 +410,7 @@ int cx231xx_afe_update_power_control(struct cx231xx *dev, 
			status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,

						0x00);

		} else {

			pr_info("Invalid AV mode input\n");

			pr_debug("Invalid AV mode input\n");

			status = -1;

		}

		break;
@@ -467,7 +467,7 @@ int cx231xx_afe_update_power_control(struct cx231xx *dev, 
			status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,

							0x40);

		} else {

			pr_info("Invalid AV mode input\n");

			pr_debug("Invalid AV mode input\n");

			status = -1;

		}

	}			/* switch  */
@@ -628,8 +628,7 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev, 
	if (pin_type != dev->video_input) {

		status = cx231xx_afe_adjust_ref_count(dev, pin_type);

		if (status < 0) {

			pr_err("%s: adjust_ref_count :Failed to set"

				"AFE input mux - errCode [%d]!\n",

			pr_err("%s: adjust_ref_count :Failed to set AFE input mux - errCode [%d]!\n",

				__func__, status);

			return status;

		}
@@ -638,8 +637,7 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev, 
	/* call afe block to set video inputs */

	status = cx231xx_afe_set_input_mux(dev, input);

	if (status < 0) {

		pr_err("%s: set_input_mux :Failed to set"

				" AFE input mux - errCode [%d]!\n",

		pr_err("%s: set_input_mux :Failed to set AFE input mux - errCode [%d]!\n",

			__func__, status);

		return status;

	}
@@ -670,8 +668,7 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev, 
		/* Tell DIF object to go to baseband mode  */

		status = cx231xx_dif_set_standard(dev, DIF_USE_BASEBAND);

		if (status < 0) {

			pr_err("%s: cx231xx_dif set to By pass"

						   " mode- errCode [%d]!\n",

			pr_err("%s: cx231xx_dif set to By pass mode- errCode [%d]!\n",

				__func__, status);

			return status;

		}
@@ -715,8 +712,7 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev, 
		/* Tell DIF object to go to baseband mode */

		status = cx231xx_dif_set_standard(dev, DIF_USE_BASEBAND);

		if (status < 0) {

			pr_err("%s: cx231xx_dif set to By pass"

						   " mode- errCode [%d]!\n",

			pr_err("%s: cx231xx_dif set to By pass mode- errCode [%d]!\n",

				__func__, status);

			return status;

		}
@@ -790,8 +786,7 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev, 
			status = cx231xx_dif_set_standard(dev,

							  DIF_USE_BASEBAND);

			if (status < 0) {

				pr_err("%s: cx231xx_dif set to By pass"

						" mode- errCode [%d]!\n",

				pr_err("%s: cx231xx_dif set to By pass mode- errCode [%d]!\n",

				       __func__, status);

				return status;

			}
@@ -826,8 +821,7 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev, 
			/* Reinitialize the DIF */

			status = cx231xx_dif_set_standard(dev, dev->norm);

			if (status < 0) {

				pr_err("%s: cx231xx_dif set to By pass"

						" mode- errCode [%d]!\n",

				pr_err("%s: cx231xx_dif set to By pass mode- errCode [%d]!\n",

					__func__, status);

				return status;

			}
@@ -970,14 +964,14 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev) 
{

	int status = 0;



	pr_info("do_mode_ctrl_overrides : 0x%x\n",

		     (unsigned int)dev->norm);

	pr_debug("%s: 0x%x\n",

		__func__, (unsigned int)dev->norm);



	/* Change the DFE_CTRL3 bp_percent to fix flagging */

	status = vid_blk_write_word(dev, DFE_CTRL3, 0xCD3F0280);



	if (dev->norm & (V4L2_STD_NTSC | V4L2_STD_PAL_M)) {

		pr_info("do_mode_ctrl_overrides NTSC\n");

		pr_debug("%s: NTSC\n", __func__);



		/* Move the close caption lines out of active video,

		   adjust the active video start point */
@@ -1004,7 +998,7 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev) 
							(FLD_HBLANK_CNT, 0x79));



	} else if (dev->norm & V4L2_STD_SECAM) {

		pr_info("do_mode_ctrl_overrides SECAM\n");

		pr_debug("%s: SECAM\n", __func__);

		status =  cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,

							VERT_TIM_CTRL,
@@ -1031,7 +1025,7 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev) 
							cx231xx_set_field

							(FLD_HBLANK_CNT, 0x85));

	} else {

		pr_info("do_mode_ctrl_overrides PAL\n");

		pr_debug("%s: PAL\n", __func__);

		status = cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,

							VERT_TIM_CTRL,
@@ -1331,113 +1325,113 @@ void cx231xx_dump_HH_reg(struct cx231xx *dev) 


	for (i = 0x100; i < 0x140; i++) {

		vid_blk_read_word(dev, i, &value);

		pr_info("reg0x%x=0x%x\n", i, value);

		pr_debug("reg0x%x=0x%x\n", i, value);

		i = i+3;

	}



	for (i = 0x300; i < 0x400; i++) {

		vid_blk_read_word(dev, i, &value);

		pr_info("reg0x%x=0x%x\n", i, value);

		pr_debug("reg0x%x=0x%x\n", i, value);

		i = i+3;

	}



	for (i = 0x400; i < 0x440; i++) {

		vid_blk_read_word(dev, i,  &value);

		pr_info("reg0x%x=0x%x\n", i, value);

		pr_debug("reg0x%x=0x%x\n", i, value);

		i = i+3;

	}



	vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value);

	pr_info("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);

	pr_debug("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);

	vid_blk_write_word(dev, AFE_CTRL_C2HH_SRC_CTRL, 0x4485D390);

	vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value);

	pr_info("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);

	pr_debug("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);

}



void cx231xx_dump_SC_reg(struct cx231xx *dev)

#if 0

static void cx231xx_dump_SC_reg(struct cx231xx *dev)

{

	u8 value[4] = { 0, 0, 0, 0 };

	pr_info("cx231xx_dump_SC_reg!\n");

	pr_debug("%s!\n", __func__);



	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, BOARD_CFG_STAT,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", BOARD_CFG_STAT, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", BOARD_CFG_STAT, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS_MODE_REG,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS_MODE_REG, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS_MODE_REG, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS1_CFG_REG,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS1_CFG_REG, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS1_CFG_REG, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS1_LENGTH_REG,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS1_LENGTH_REG, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS1_LENGTH_REG, value[0],

				 value[1], value[2], value[3]);



	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS2_CFG_REG,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS2_CFG_REG, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS2_CFG_REG, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS2_LENGTH_REG,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS2_LENGTH_REG, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS2_LENGTH_REG, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, EP_MODE_SET,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", EP_MODE_SET, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", EP_MODE_SET, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_PTN1,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN1, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN1, value[0],

				 value[1], value[2], value[3]);



	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_PTN2,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN2, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN2, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_PTN3,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN3, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN3, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_MASK0,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK0, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK0, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_MASK1,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK1, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK1, value[0],

				 value[1], value[2], value[3]);



	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_MASK2,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK2, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK2, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_GAIN,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_GAIN, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_GAIN, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_CAR_REG,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_CAR_REG, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_CAR_REG, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_OT_CFG1,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_OT_CFG1, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_OT_CFG1, value[0],

				 value[1], value[2], value[3]);



	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_OT_CFG2,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_OT_CFG2, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_OT_CFG2, value[0],

				 value[1], value[2], value[3]);

	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN,

				 value, 4);

	pr_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", PWR_CTL_EN, value[0],

	pr_debug("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", PWR_CTL_EN, value[0],

				 value[1], value[2], value[3]);





}

#endif



void cx231xx_Setup_AFE_for_LowIF(struct cx231xx *dev)
@@ -1503,7 +1497,7 @@ void cx231xx_set_Colibri_For_LowIF(struct cx231xx *dev, u32 if_freq, 
	u32 standard = 0;

	u8 value[4] = { 0, 0, 0, 0 };



	pr_info("Enter cx231xx_set_Colibri_For_LowIF()\n");

	pr_debug("Enter cx231xx_set_Colibri_For_LowIF()\n");

	value[0] = (u8) 0x6F;

	value[1] = (u8) 0x6F;

	value[2] = (u8) 0x6F;
@@ -1523,7 +1517,7 @@ void cx231xx_set_Colibri_For_LowIF(struct cx231xx *dev, u32 if_freq, 
	colibri_carrier_offset = cx231xx_Get_Colibri_CarrierOffset(mode,

								   standard);



	pr_info("colibri_carrier_offset=%d, standard=0x%x\n",

	pr_debug("colibri_carrier_offset=%d, standard=0x%x\n",

		     colibri_carrier_offset, standard);



	/* Set the band Pass filter for DIF*/
@@ -1557,7 +1551,7 @@ void cx231xx_set_DIF_bandpass(struct cx231xx *dev, u32 if_freq, 
	u64 pll_freq_u64 = 0;

	u32 i = 0;



	pr_info("if_freq=%d;spectral_invert=0x%x;mode=0x%x\n",

	pr_debug("if_freq=%d;spectral_invert=0x%x;mode=0x%x\n",

			 if_freq, spectral_invert, mode);
@@ -1601,7 +1595,7 @@ void cx231xx_set_DIF_bandpass(struct cx231xx *dev, u32 if_freq, 
		if_freq = 16000000;

	}



	pr_info("Enter IF=%zu\n",

	pr_debug("Enter IF=%zu\n",

			ARRAY_SIZE(Dif_set_array));

	for (i = 0; i < ARRAY_SIZE(Dif_set_array); i++) {

		if (Dif_set_array[i].if_freq == if_freq) {
@@ -1714,7 +1708,7 @@ int cx231xx_dif_set_standard(struct cx231xx *dev, u32 standard) 
	u32 dif_misc_ctrl_value = 0;

	u32 func_mode = 0;



	pr_info("%s: setStandard to %x\n", __func__, standard);

	pr_debug("%s: setStandard to %x\n", __func__, standard);



	status = vid_blk_read_word(dev, DIF_MISC_CTRL, &dif_misc_ctrl_value);

	if (standard != DIF_USE_BASEBAND)
@@ -2117,8 +2111,8 @@ int cx231xx_tuner_post_channel_change(struct cx231xx *dev) 
{

	int status = 0;

	u32 dwval;

	pr_info("cx231xx_tuner_post_channel_change  dev->tuner_type =0%d\n",

		     dev->tuner_type);

	pr_debug("%s: dev->tuner_type =0%d\n",

		     __func__, dev->tuner_type);

	/* Set the RF and IF k_agc values to 4 for PAL/NTSC and 8 for

	 * SECAM L/B/D standards */

	status = vid_blk_read_word(dev, DIF_AGC_IF_REF, &dwval);
@@ -2219,8 +2213,8 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode) 
	if (dev->power_mode != mode)

		dev->power_mode = mode;

	else {

		pr_info(" setPowerMode::mode = %d, No Change req.\n",

			     mode);

		pr_debug("%s: mode = %d, No Change req.\n",

			 __func__, mode);

		return 0;

	}
@@ -2459,7 +2453,7 @@ int cx231xx_start_stream(struct cx231xx *dev, u32 ep_mask) 
	u32 tmp = 0;

	int status = 0;



	pr_info("cx231xx_start_stream():: ep_mask = %x\n", ep_mask);

	pr_debug("%s: ep_mask = %x\n", __func__, ep_mask);

	status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, EP_MODE_SET,

				       value, 4);

	if (status < 0)
@@ -2484,7 +2478,7 @@ int cx231xx_stop_stream(struct cx231xx *dev, u32 ep_mask) 
	u32 tmp = 0;

	int status = 0;



	pr_info("cx231xx_stop_stream():: ep_mask = %x\n", ep_mask);

	pr_debug("%s: ep_mask = %x\n", __func__, ep_mask);

	status =

	    cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, EP_MODE_SET, value, 4);

	if (status < 0)
@@ -2512,24 +2506,24 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type) 
	if (dev->udev->speed == USB_SPEED_HIGH) {

		switch (media_type) {

		case Audio:

			pr_info("%s: Audio enter HANC\n", __func__);

			pr_debug("%s: Audio enter HANC\n", __func__);

			status =

			    cx231xx_mode_register(dev, TS_MODE_REG, 0x9300);

			break;



		case Vbi:

			pr_info("%s: set vanc registers\n", __func__);

			pr_debug("%s: set vanc registers\n", __func__);

			status = cx231xx_mode_register(dev, TS_MODE_REG, 0x300);

			break;



		case Sliced_cc:

			pr_info("%s: set hanc registers\n", __func__);

			pr_debug("%s: set hanc registers\n", __func__);

			status =

			    cx231xx_mode_register(dev, TS_MODE_REG, 0x1300);

			break;



		case Raw_Video:

			pr_info("%s: set video registers\n", __func__);

			pr_debug("%s: set video registers\n", __func__);

			status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);

			break;
@@ -2569,7 +2563,7 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type) 
			break;



		case TS1_parallel_mode:

			pr_info("%s: set ts1 parallel mode registers\n",

			pr_debug("%s: set ts1 parallel mode registers\n",

				     __func__);

			status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);

			status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400);
@@ -2923,7 +2917,7 @@ int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev) 
			 (nCnt > 0));



	if (nCnt == 0)

		pr_info("No ACK after %d msec -GPIO I2C failed!",

		pr_debug("No ACK after %d msec -GPIO I2C failed!",

			     nInit * 10);



	/*

drivers/media/usb/cx231xx/cx231xx-cards.c

+33 −48
Original line number Diff line number Diff line
@@ -856,8 +856,7 @@ int cx231xx_tuner_callback(void *ptr, int component, int command, int arg) 


	if (dev->tuner_type == TUNER_XC5000) {

		if (command == XC5000_TUNER_RESET) {

			pr_info

				("Tuner CB: RESET: cmd %d : tuner type %d \n",

			pr_debug("Tuner CB: RESET: cmd %d : tuner type %d \n",

				 command, dev->tuner_type);

			cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,

					       1);
@@ -1008,7 +1007,7 @@ static int read_eeprom(struct cx231xx *dev, struct i2c_client *client, 
	}



	for (i = 0; i + 15 < len; i += 16)

		pr_info("i2c eeprom %02x: %*ph\n", i, 16, &eedata[i]);

		pr_debug("i2c eeprom %02x: %*ph\n", i, 16, &eedata[i]);



	return 0;

}
@@ -1028,7 +1027,7 @@ void cx231xx_card_setup(struct cx231xx *dev) 
					cx231xx_get_i2c_adap(dev, I2C_0),

					"cx25840", 0x88 >> 1, NULL);

		if (dev->sd_cx25840 == NULL)

			pr_info("cx25840 subdev registration failure\n");

			pr_err("cx25840 subdev registration failure\n");

		cx25840_call(dev, core, load_fw);



	}
@@ -1042,7 +1041,7 @@ void cx231xx_card_setup(struct cx231xx *dev) 
						    "tuner",

						    dev->tuner_addr, NULL);

		if (dev->sd_tuner == NULL)

			pr_info("tuner subdev registration failure\n");

			pr_err("tuner subdev registration failure\n");

		else

			cx231xx_config_tuner(dev);

	}
@@ -1290,20 +1289,18 @@ static int cx231xx_init_v4l2(struct cx231xx *dev, 
	dev->video_mode.end_point_addr = uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress;

	dev->video_mode.num_alt = uif->num_altsetting;



	pr_info("EndPoint Addr 0x%x, Alternate settings: %i\n",

	pr_info("video EndPoint Addr 0x%x, Alternate settings: %i\n",

		     dev->video_mode.end_point_addr,

		     dev->video_mode.num_alt);



	dev->video_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->video_mode.num_alt, GFP_KERNEL);

	if (dev->video_mode.alt_max_pkt_size == NULL) {

		pr_err("out of memory!\n");

	if (dev->video_mode.alt_max_pkt_size == NULL)

		return -ENOMEM;

	}



	for (i = 0; i < dev->video_mode.num_alt; i++) {

		u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.wMaxPacketSize);

		dev->video_mode.alt_max_pkt_size[i] = (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);

		pr_info("Alternate setting %i, max size= %i\n", i,

		pr_debug("Alternate setting %i, max size= %i\n", i,

			 dev->video_mode.alt_max_pkt_size[i]);

	}
@@ -1321,16 +1318,14 @@ static int cx231xx_init_v4l2(struct cx231xx *dev, 
			bEndpointAddress;



	dev->vbi_mode.num_alt = uif->num_altsetting;

	pr_info("EndPoint Addr 0x%x, Alternate settings: %i\n",

	pr_info("VBI EndPoint Addr 0x%x, Alternate settings: %i\n",

		     dev->vbi_mode.end_point_addr,

		     dev->vbi_mode.num_alt);



	/* compute alternate max packet sizes for vbi */

	dev->vbi_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->vbi_mode.num_alt, GFP_KERNEL);

	if (dev->vbi_mode.alt_max_pkt_size == NULL) {

		pr_err("out of memory!\n");

	if (dev->vbi_mode.alt_max_pkt_size == NULL)

		return -ENOMEM;

	}



	for (i = 0; i < dev->vbi_mode.num_alt; i++) {

		u16 tmp =
@@ -1338,7 +1333,7 @@ static int cx231xx_init_v4l2(struct cx231xx *dev, 
				desc.wMaxPacketSize);

		dev->vbi_mode.alt_max_pkt_size[i] =

		    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);

		pr_info("Alternate setting %i, max size= %i\n", i,

		pr_debug("Alternate setting %i, max size= %i\n", i,

			 dev->vbi_mode.alt_max_pkt_size[i]);

	}
@@ -1357,22 +1352,19 @@ static int cx231xx_init_v4l2(struct cx231xx *dev, 
			bEndpointAddress;



	dev->sliced_cc_mode.num_alt = uif->num_altsetting;

	pr_info("EndPoint Addr 0x%x, Alternate settings: %i\n",

	pr_info("sliced CC EndPoint Addr 0x%x, Alternate settings: %i\n",

		dev->sliced_cc_mode.end_point_addr,

		dev->sliced_cc_mode.num_alt);

	dev->sliced_cc_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->sliced_cc_mode.num_alt, GFP_KERNEL);



	if (dev->sliced_cc_mode.alt_max_pkt_size == NULL) {

		pr_err("out of memory!\n");

	if (dev->sliced_cc_mode.alt_max_pkt_size == NULL)

		return -ENOMEM;

	}



	for (i = 0; i < dev->sliced_cc_mode.num_alt; i++) {

		u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].

				desc.wMaxPacketSize);

		dev->sliced_cc_mode.alt_max_pkt_size[i] =

		    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);

		pr_info("Alternate setting %i, max size= %i\n", i,

		pr_debug("Alternate setting %i, max size= %i\n", i,

			 dev->sliced_cc_mode.alt_max_pkt_size[i]);

	}
@@ -1410,8 +1402,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		nr = find_first_zero_bit(&cx231xx_devused, CX231XX_MAXBOARDS);

		if (nr >= CX231XX_MAXBOARDS) {

			/* No free device slots */

			pr_err(DRIVER_NAME ": Supports only %i devices.\n",

					CX231XX_MAXBOARDS);

			pr_err("Supports only %i devices.\n", CX231XX_MAXBOARDS);

			return -ENOMEM;

		}

	} while (test_and_set_bit(nr, &cx231xx_devused));
@@ -1421,7 +1412,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
	/* allocate memory for our device state and initialize it */

	dev = devm_kzalloc(&udev->dev, sizeof(*dev), GFP_KERNEL);

	if (dev == NULL) {

		pr_err(DRIVER_NAME ": out of memory!\n");

		clear_bit(nr, &cx231xx_devused);

		return -ENOMEM;

	}
@@ -1468,8 +1458,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
		speed = "unknown";

	}



	pr_info("New device %s %s @ %s Mbps "

	     "(%04x:%04x) with %d interfaces\n",

	pr_info("New device %s %s @ %s Mbps (%04x:%04x) with %d interfaces\n",

		udev->manufacturer ? udev->manufacturer : "",

		udev->product ? udev->product : "",

		speed,
@@ -1485,13 +1474,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 


	assoc_desc = udev->actconfig->intf_assoc[0];

	if (assoc_desc->bFirstInterface != ifnum) {

		pr_err(DRIVER_NAME ": Not found "

			    "matching IAD interface\n");

		pr_err("Not found matching IAD interface\n");

		retval = -ENODEV;

		goto err_if;

	}



	pr_info("registering interface %d\n", ifnum);

	pr_debug("registering interface %d\n", ifnum);



	/* save our data pointer in this interface device */

	usb_set_intfdata(interface, dev);
@@ -1527,13 +1515,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
				desc.bEndpointAddress;



		dev->ts1_mode.num_alt = uif->num_altsetting;

		pr_info("EndPoint Addr 0x%x, Alternate settings: %i\n",

		pr_info("TS EndPoint Addr 0x%x, Alternate settings: %i\n",

			     dev->ts1_mode.end_point_addr,

			     dev->ts1_mode.num_alt);



		dev->ts1_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->ts1_mode.num_alt, GFP_KERNEL);

		if (dev->ts1_mode.alt_max_pkt_size == NULL) {

			pr_err("out of memory!\n");

			retval = -ENOMEM;

			goto err_video_alt;

		}
@@ -1544,7 +1531,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface, 
						wMaxPacketSize);

			dev->ts1_mode.alt_max_pkt_size[i] =

			    (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);

			pr_info("Alternate setting %i, max size= %i\n", i,

			pr_debug("Alternate setting %i, max size= %i\n", i,

				     dev->ts1_mode.alt_max_pkt_size[i]);

		}

	}
@@ -1609,9 +1596,7 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface) 
	wake_up_interruptible_all(&dev->open);



	if (dev->users) {

		pr_warn

		    ("device %s is open! Deregistration and memory "

		     "deallocation are deferred on close.\n",

		pr_warn("device %s is open! Deregistration and memory deallocation are deferred on close.\n",

			video_device_node_name(dev->vdev));



		/* Even having users, it is safe to remove the RC i2c driver */

drivers/media/usb/cx231xx/cx231xx-core.c

+36 −57

File changed.

Preview size limit exceeded, changes collapsed.