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

Commit 06133bdc authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: dvb_frontend: get rid of dtv_get_property_dump() 



Simplify the get property handling and move it to the existing
code at dtv_property_process_get() directly.

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

drivers/media/dvb-core/dvb_frontend.c

+12 −31
Original line number Diff line number Diff line
@@ -1090,36 +1090,6 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = { 
	_DTV_CMD(DTV_STAT_TOTAL_BLOCK_COUNT, 0, 0),

};



static void dtv_get_property_dump(struct dvb_frontend *fe,

			      struct dtv_property *tvp)

{

	int i;



	if (tvp->cmd <= 0 || tvp->cmd > DTV_MAX_COMMAND) {

		dev_warn(fe->dvb->device, "%s: GET tvp.cmd = 0x%08x undefined\n"

				, __func__,

				tvp->cmd);

		return;

	}



	dev_dbg(fe->dvb->device, "%s: GET tvp.cmd    = 0x%08x (%s)\n", __func__,

		tvp->cmd,

		dtv_cmds[tvp->cmd].name);



	if (dtv_cmds[tvp->cmd].buffer) {

		dev_dbg(fe->dvb->device, "%s: tvp.u.buffer.len = 0x%02x\n",

			__func__, tvp->u.buffer.len);



		for(i = 0; i < tvp->u.buffer.len; i++)

			dev_dbg(fe->dvb->device,

					"%s: tvp.u.buffer.data[0x%02x] = 0x%02x\n",

					__func__, i, tvp->u.buffer.data[i]);

	} else {

		dev_dbg(fe->dvb->device, "%s: tvp.u.data = 0x%08x\n", __func__,

				tvp->u.data);

	}

}



/* Synchronise the legacy tuning parameters into the cache, so that demodulator

 * drivers can use a single set_frontend tuning function, regardless of whether

 * it's being used for the legacy or new API, reducing code and complexity.
@@ -1512,7 +1482,18 @@ static int dtv_property_process_get(struct dvb_frontend *fe, 
		return -EINVAL;

	}



	dtv_get_property_dump(fe, tvp);

	if (!dtv_cmds[tvp->cmd].buffer)

		dev_dbg(fe->dvb->device,

			"%s: GET cmd 0x%08x (%s) = 0x%08x\n",

			__func__, tvp->cmd, dtv_cmds[tvp->cmd].name,

			tvp->u.data);

	else

		dev_dbg(fe->dvb->device,

			"%s: GET cmd 0x%08x (%s) len %d: %*ph\n",

			__func__,

			tvp->cmd, dtv_cmds[tvp->cmd].name,

			tvp->u.buffer.len,

			tvp->u.buffer.len, tvp->u.buffer.data);



	return 0;

}