Commit 004e24f9 authored by Stefan Herdler's avatar Stefan Herdler Committed by Hans Verkuil
Browse files

media: ttpci: coding style fixes: comments 



This patch fixes the following checkpatch warnings:

WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines
WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line
WARNING: It's generally not useful to have the filename in the file

Signed-off-by: default avatarStefan Herdler <herdler@nurfuerspam.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 77f5be68

drivers/media/pci/ttpci/budget-av.c

+12 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * budget-av.c: driver for the SAA7146 based Budget DVB cards

 *              with analog video in

 * budget-av.ko: driver for the SAA7146 based Budget DVB cards

 *               with analog video input (and optionally with CI)

 *

 * Compiled from various sources by Michael Hunold <michael@mihu.de>

 *
@@ -63,8 +63,8 @@ struct budget_av { 


static int ciintf_slot_shutdown(struct dvb_ca_en50221 *ca, int slot);





/* GPIO Connections:

/*

 * GPIO Connections:

 * 0 - Vcc/Reset (Reset is controlled by capacitor). Resets the frontend *AS WELL*!

 * 1 - CI memory select 0=>IO memory, 1=>Attribute Memory

 * 2 - CI Card Enable (Active Low)
@@ -267,8 +267,10 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open 
	if (slot != 0)

		return -EINVAL;



	/* test the card detect line - needs to be done carefully

	 * since it never goes high for some CAMs on this interface (e.g. topuptv) */

	/*

	 * test the card detect line - needs to be done carefully

	 * since it never goes high for some CAMs on this interface (e.g. topuptv)

	 */

	if (budget_av->slot_status == SLOTSTATUS_NONE) {

		saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);

		udelay(1);
@@ -281,12 +283,14 @@ static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open 
		saa7146_setgpio(saa, 3, SAA7146_GPIO_OUTLO);

	}



	/* We also try and read from IO memory to work round the above detection bug. If

	/*

	 * We also try and read from IO memory to work round the above detection bug. If

	 * there is no CAM, we will get a timeout. Only done if there is no cam

	 * present, since this test actually breaks some cams :(

	 *

	 * if the CI interface is not open, we also do the above test since we

	 * don't care if the cam has problems - we'll be resetting it on open() anyway */

	 * don't care if the cam has problems - we'll be resetting it on open() anyway

	 */

	if ((budget_av->slot_status == SLOTSTATUS_NONE) || (!open)) {

		saa7146_setgpio(budget_av->budget.dev, 1, SAA7146_GPIO_OUTLO);

		result = ttpci_budget_debiread(&budget_av->budget, DEBICICAM, 0, 1, 0, 1);

drivers/media/pci/ttpci/budget-ci.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * budget-ci.c: driver for the SAA7146 based Budget DVB cards

 * budget-ci.ko: driver for the SAA7146 based Budget DVB cards

 *               with CI (but without analog video input)

 *

 * Compiled from various sources by Michael Hunold <michael@mihu.de>

 *

drivers/media/pci/ttpci/budget-core.c

+5 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * budget-core.c: driver for the SAA7146 based Budget DVB cards

 * budget-core.ko: base-driver for the SAA7146 based Budget DVB cards

 *

 * Compiled from various sources by Michael Hunold <michael@mihu.de>

 *
@@ -491,8 +491,10 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev, 
	spin_lock_init(&budget->feedlock);

	spin_lock_init(&budget->debilock);



	/* the Siemens DVB needs this if you want to have the i2c chips

	   get recognized before the main driver is loaded */

	/*

	 * the Siemens DVB needs this if you want to have the i2c chips

	 * get recognized before the main driver is loaded

	 */

	if (bi->type != BUDGET_FS_ACTIVY)

		saa7146_write(dev, GPIO_CTRL, 0x500000);	/* GPIO 3 = 1 */

drivers/media/pci/ttpci/budget.c

+17 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * budget.c: driver for the SAA7146 based Budget DVB cards

 * budget.ko: driver for the SAA7146 based Budget DVB cards

 *            without analog video input or CI

 *

 * Compiled from various sources by Michael Hunold <michael@mihu.de>

 *
@@ -50,9 +51,11 @@ static void Set22K(struct budget *budget, int state) 
	saa7146_setgpio(dev, 3, (state ? SAA7146_GPIO_OUTHI : SAA7146_GPIO_OUTLO));

}



/* Diseqc functions only for TT Budget card */

/* taken from the Skyvision DVB driver by

   Ralph Metzler <rjkm@metzlerbros.de> */

/*

 * Diseqc functions only for TT Budget card

 * taken from the Skyvision DVB driver by

 * Ralph Metzler <rjkm@metzlerbros.de>

 */



static void DiseqcSendBit(struct budget *budget, int data)

{
@@ -675,9 +678,11 @@ static void frontend_init(struct budget *budget) 
					tt1600_stv090x_config.tuner_set_refclk	  = ctl->tuner_set_refclk;

					tt1600_stv090x_config.tuner_get_status	  = ctl->tuner_get_status;



					/* call the init function once to initialize

					   tuner's clock output divider and demod's

					   master clock */

					/*

					 * call the init function once to initialize

					 * tuner's clock output divider and demod's

					 * master clock

					 */

					if (budget->dvb_frontend->ops.init)

						budget->dvb_frontend->ops.init(budget->dvb_frontend);
@@ -730,9 +735,11 @@ static void frontend_init(struct budget *budget) 
					tt1600_stv090x_config.tuner_set_refclk	  = ctl->tuner_set_refclk;

					tt1600_stv090x_config.tuner_get_status	  = ctl->tuner_get_status;



					/* call the init function once to initialize

					   tuner's clock output divider and demod's

					   master clock */

					/*

					 * call the init function once to initialize

					 * tuner's clock output divider and demod's

					 * master clock

					 */

					if (budget->dvb_frontend->ops.init)

						budget->dvb_frontend->ops.init(budget->dvb_frontend);