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

Commit 6139ebc6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] saa7134: fix CodingStyle issues on the lines touched by pr_foo refactor 



Several lines touched by the pr_foo refactoring patches are not
following the Linux Coding style.

While we won't be fixing the style globally at the driver, we should,
at least, fix on the lines we touched.

Basically, this patch add (or remove) whitespaces and blank lines
where needed.

No functional changes.

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

drivers/media/pci/saa7134/saa7134-alsa.c

+6 −3
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev, 
	}



	if (dev->dmasound.read_count >= dev->dmasound.blksize * (dev->dmasound.blocks-2)) {

		pr_debug("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count,

		pr_debug("irq: overrun [full=%d/%d] - Blocks in %d\n",

			dev->dmasound.read_count,

			dev->dmasound.bufsize, dev->dmasound.blocks);

		spin_unlock(&dev->slock);

		snd_pcm_stop_xrun(dev->dmasound.substream);
@@ -173,7 +174,8 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev, 
	saa_writel(reg,next_blk * dev->dmasound.blksize);

	pr_debug("irq: ok, %s, next_blk=%d, addr=%x, blocks=%u, size=%u, read=%u\n",

		(status & 0x10000000) ? "even" : "odd ", next_blk,

		next_blk * dev->dmasound.blksize, dev->dmasound.blocks, dev->dmasound.blksize, dev->dmasound.read_count);

		 next_blk * dev->dmasound.blksize, dev->dmasound.blocks,

		 dev->dmasound.blksize, dev->dmasound.read_count);



	/* update status & wake waiting readers */

	dev->dmasound.dma_blk = (dev->dmasound.dma_blk + 1) % dev->dmasound.blocks;
@@ -1186,7 +1188,8 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) 
	sprintf(card->longname, "%s at 0x%lx irq %d",

		chip->dev->name, chip->iobase, chip->irq);



	pr_info("%s/alsa: %s registered as card %d\n",dev->name,card->longname,index[devnum]);

	pr_info("%s/alsa: %s registered as card %d\n",

		dev->name, card->longname, index[devnum]);



	if ((err = snd_card_register(card)) == 0) {

		snd_saa7134_cards[devnum] = card;

drivers/media/pci/saa7134/saa7134-cards.c

+6 −4
Original line number Diff line number Diff line
@@ -7826,7 +7826,8 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
				dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3;

				break;

			default:

				pr_err("%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t);

				pr_err("%s Can't determine tuner type %x from EEPROM\n",

				       dev->name, tuner_t);

			}

		} else if ((data[1] != 0) && (data[1] != 0xff)) {

			/* new config structure */
@@ -7847,7 +7848,8 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
				       dev->name);

				break;

			default:

				pr_err("%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t);

				pr_err("%s Can't determine tuner type %x from EEPROM\n",

				       dev->name, tuner_t);

			}

		} else {

			pr_err("%s unexpected config structure\n", dev->name);

drivers/media/pci/saa7134/saa7134-core.c

+7 −6
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value) 
	index = 1 << bit_no;

	switch (value) {

	case 0: /* static value */

	case 1:	core_dbg("setting GPIO%d to static %d\n", bit_no, value);

	case 1:

		core_dbg("setting GPIO%d to static %d\n", bit_no, value);

		/* turn sync mode off if necessary */

		if (index & 0x00c00000)

			saa_andorb(SAA7134_VIDEO_PORT_CTRL6, 0x0f, 0x00);
@@ -1209,7 +1210,7 @@ static int saa7134_buffer_requeue(struct saa7134_dev *dev, 
	if (!buf)

		return 0;



	core_dbg("buffer_requeue : resending active buffers \n");

	core_dbg("buffer_requeue : resending active buffer\n");



	if (!list_empty(&q->queue))

		next = list_entry(q->queue.next, struct saa7134_buf,

drivers/media/pci/saa7134/saa7134-dvb.c

+18 −9
Original line number Diff line number Diff line
@@ -558,11 +558,14 @@ static int philips_tda827x_tuner_init(struct dvb_frontend *fe) 
	struct tda1004x_state *state = fe->demodulator_priv;



	switch (state->config->antenna_switch) {

	case 0: break;

	case 1:	pr_debug("setting GPIO21 to 0 (TV antenna?)\n");

	case 0:

		break;

	case 1:

		pr_debug("setting GPIO21 to 0 (TV antenna?)\n");

		saa7134_set_gpio(dev, 21, 0);

		break;

	case 2: pr_debug("setting GPIO21 to 1 (Radio antenna?)\n");

	case 2:

		pr_debug("setting GPIO21 to 1 (Radio antenna?)\n");

		saa7134_set_gpio(dev, 21, 1);

		break;

	}
@@ -575,11 +578,14 @@ static int philips_tda827x_tuner_sleep(struct dvb_frontend *fe) 
	struct tda1004x_state *state = fe->demodulator_priv;



	switch (state->config->antenna_switch) {

	case 0: break;

	case 1: pr_debug("setting GPIO21 to 1 (Radio antenna?)\n");

	case 0:

		break;

	case 1:

		pr_debug("setting GPIO21 to 1 (Radio antenna?)\n");

		saa7134_set_gpio(dev, 21, 1);

		break;

	case 2:	pr_debug("setting GPIO21 to 0 (TV antenna?)\n");

	case 2:

		pr_debug("setting GPIO21 to 0 (TV antenna?)\n");

		saa7134_set_gpio(dev, 21, 0);

		break;

	}
@@ -1029,7 +1035,8 @@ static int md8800_set_voltage2(struct dvb_frontend *fe, fe_sec_voltage_t voltage 


static int md8800_set_high_voltage2(struct dvb_frontend *fe, long arg)

{

	pr_warn("%s: sorry can't set high LNB supply voltage from here\n", __func__);

	pr_warn("%s: sorry can't set high LNB supply voltage from here\n",

		__func__);

	return -EIO;

}
@@ -1388,13 +1395,15 @@ static int dvb_init(struct saa7134_dev *dev) 
			if (fe0->dvb.frontend) {

				if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x63,

									&dev->i2c_adap, 0) == NULL) {

					pr_warn("%s: Lifeview Trio, No tda826x found!\n", __func__);

					pr_warn("%s: Lifeview Trio, No tda826x found!\n",

						__func__);

					goto detach_frontend;

				}

				if (dvb_attach(isl6421_attach, fe0->dvb.frontend,

					       &dev->i2c_adap,

					       0x08, 0, 0, false) == NULL) {

					pr_warn("%s: Lifeview Trio, No ISL6421 found!\n", __func__);

					pr_warn("%s: Lifeview Trio, No ISL6421 found!\n",

						__func__);

					goto detach_frontend;

				}

			}

drivers/media/pci/saa7134/saa7134-i2c.c

+3 −2
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ saa7134_i2c_eeprom(struct saa7134_dev *dev, unsigned char *eedata, int len) 


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

		int size = (len - i) > 16 ? 16 : len - i;



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

	}