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

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

[media] saa7134: fix a few other occurrences of KERN_INFO/KERN_WARNING 



On a few places, the search expression used on the script that
replaced pr_info/pr_warn didn't match, because the string were
on the next line.

It is best to manually edit those lines, and re-indent the
paragraphs.

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

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

+6 −9
Original line number Diff line number Diff line
@@ -7906,8 +7906,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
	/* The card below is detected as card=53, but is different */

	       if (dev->autodetected && (dev->eedata[0x27] == 0x03)) {

			dev->board = SAA7134_BOARD_ASUSTeK_P7131_ANALOG;

			printk(KERN_INFO

			       "%s: P7131 analog only, using entry of %s\n",

			pr_info("%s: P7131 analog only, using entry of %s\n",

				dev->name, saa7134_boards[dev->board].name);



			/*
@@ -8047,8 +8046,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
			msg.buf = &buffer[i][0];

			msg.len = ARRAY_SIZE(buffer[0]);

			if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)

				printk(KERN_WARNING

				       "%s: Unable to enable tuner(%i).\n",

				pr_warn("%s: Unable to enable tuner(%i).\n",

				        dev->name, i);

		}

		break;
@@ -8065,8 +8063,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) 
		/* watch TV without software reboot. For solve this problem */

		/* switch the tuner to analog TV mode manually.             */

		if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)

				printk(KERN_WARNING

				      "%s: Unable to enable IF of the tuner.\n",

			pr_warn("%s: Unable to enable IF of the tuner.\n",

				dev->name);

		break;

	}

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

+13 −15
Original line number Diff line number Diff line
@@ -772,8 +772,7 @@ static void must_configure_manually(int has_eeprom) 
	unsigned int i,p;



	if (!has_eeprom)

		printk(KERN_WARNING

		       "saa7134: <rant>\n"

		pr_warn("saa7134: <rant>\n"

			"saa7134:  Congratulations!  Your TV card vendor saved a few\n"

			"saa7134:  cents for a eeprom, thus your pci board has no\n"

			"saa7134:  subsystem ID and I can't identify it automatically\n"
@@ -782,8 +781,7 @@ static void must_configure_manually(int has_eeprom) 
			"saa7134: You can use the card=<nr> insmod option to specify\n"

			"saa7134: which board do you have.  The list:\n");

	else

		printk(KERN_WARNING

		       "saa7134: Board is currently unknown. You might try to use the card=<nr>\n"

		pr_warn("saa7134: Board is currently unknown. You might try to use the card=<nr>\n"

			"saa7134: insmod option to specify which board do you have, but this is\n"

			"saa7134: somewhat risky, as might damage your card. It is better to ask\n"

			"saa7134: for support at linux-media@vger.kernel.org.\n"