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

[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
...@@ -7906,9 +7906,8 @@ int saa7134_board_init2(struct saa7134_dev *dev) ...@@ -7906,9 +7906,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
/* The card below is detected as card=53, but is different */ /* The card below is detected as card=53, but is different */
if (dev->autodetected && (dev->eedata[0x27] == 0x03)) { if (dev->autodetected && (dev->eedata[0x27] == 0x03)) {
dev->board = SAA7134_BOARD_ASUSTeK_P7131_ANALOG; dev->board = SAA7134_BOARD_ASUSTeK_P7131_ANALOG;
printk(KERN_INFO pr_info("%s: P7131 analog only, using entry of %s\n",
"%s: P7131 analog only, using entry of %s\n", dev->name, saa7134_boards[dev->board].name);
dev->name, saa7134_boards[dev->board].name);
/* /*
* IR init has already happened for other cards, so * IR init has already happened for other cards, so
...@@ -8047,9 +8046,8 @@ int saa7134_board_init2(struct saa7134_dev *dev) ...@@ -8047,9 +8046,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
msg.buf = &buffer[i][0]; msg.buf = &buffer[i][0];
msg.len = ARRAY_SIZE(buffer[0]); msg.len = ARRAY_SIZE(buffer[0]);
if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)
printk(KERN_WARNING pr_warn("%s: Unable to enable tuner(%i).\n",
"%s: Unable to enable tuner(%i).\n", dev->name, i);
dev->name, i);
} }
break; break;
} }
...@@ -8065,9 +8063,8 @@ int saa7134_board_init2(struct saa7134_dev *dev) ...@@ -8065,9 +8063,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
/* watch TV without software reboot. For solve this problem */ /* watch TV without software reboot. For solve this problem */
/* switch the tuner to analog TV mode manually. */ /* switch the tuner to analog TV mode manually. */
if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1) if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)
printk(KERN_WARNING pr_warn("%s: Unable to enable IF of the tuner.\n",
"%s: Unable to enable IF of the tuner.\n", dev->name);
dev->name);
break; break;
} }
case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG: case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG:
......
...@@ -772,22 +772,20 @@ static void must_configure_manually(int has_eeprom) ...@@ -772,22 +772,20 @@ static void must_configure_manually(int has_eeprom)
unsigned int i,p; unsigned int i,p;
if (!has_eeprom) if (!has_eeprom)
printk(KERN_WARNING pr_warn("saa7134: <rant>\n"
"saa7134: <rant>\n" "saa7134: Congratulations! Your TV card vendor saved a few\n"
"saa7134: Congratulations! Your TV card vendor saved a few\n" "saa7134: cents for a eeprom, thus your pci board has no\n"
"saa7134: cents for a eeprom, thus your pci board has no\n" "saa7134: subsystem ID and I can't identify it automatically\n"
"saa7134: subsystem ID and I can't identify it automatically\n" "saa7134: </rant>\n"
"saa7134: </rant>\n" "saa7134: I feel better now. Ok, here are the good news:\n"
"saa7134: I feel better now. Ok, here are the good news:\n" "saa7134: You can use the card=<nr> insmod option to specify\n"
"saa7134: You can use the card=<nr> insmod option to specify\n" "saa7134: which board do you have. The list:\n");
"saa7134: which board do you have. The list:\n");
else else
printk(KERN_WARNING pr_warn("saa7134: Board is currently unknown. You might try to use the card=<nr>\n"
"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: 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: somewhat risky, as might damage your card. It is better to ask\n" "saa7134: for support at linux-media@vger.kernel.org.\n"
"saa7134: for support at linux-media@vger.kernel.org.\n" "saa7134: The supported cards are:\n");
"saa7134: The supported cards are:\n");
for (i = 0; i < saa7134_bcount; i++) { for (i = 0; i < saa7134_bcount; i++) {
pr_warn("saa7134: card=%d -> %-40.40s", pr_warn("saa7134: card=%d -> %-40.40s",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment