Commit 2af3eb64 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] tuner-xc2028: don't break long lines

Due to the 80-cols checkpatch warnings, several strings
were broken into multiple lines. This is not considered
a good practice anymore, as it makes harder to grep for
strings at the source code. So, join those continuation
lines.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 15c8ffc4
...@@ -56,8 +56,7 @@ MODULE_PARM_DESC(no_poweroff, "0 (default) powers device off when not used.\n" ...@@ -56,8 +56,7 @@ MODULE_PARM_DESC(no_poweroff, "0 (default) powers device off when not used.\n"
static char audio_std[8]; static char audio_std[8];
module_param_string(audio_std, audio_std, sizeof(audio_std), 0); module_param_string(audio_std, audio_std, sizeof(audio_std), 0);
MODULE_PARM_DESC(audio_std, MODULE_PARM_DESC(audio_std,
"Audio standard. XC3028 audio decoder explicitly " "Audio standard. XC3028 audio decoder explicitly needs to know what audio\n"
"needs to know what audio\n"
"standard is needed for some video standards with audio A2 or NICAM.\n" "standard is needed for some video standards with audio A2 or NICAM.\n"
"The valid values are:\n" "The valid values are:\n"
"A2\n" "A2\n"
...@@ -69,8 +68,8 @@ MODULE_PARM_DESC(audio_std, ...@@ -69,8 +68,8 @@ MODULE_PARM_DESC(audio_std,
static char firmware_name[30]; static char firmware_name[30];
module_param_string(firmware_name, firmware_name, sizeof(firmware_name), 0); module_param_string(firmware_name, firmware_name, sizeof(firmware_name), 0);
MODULE_PARM_DESC(firmware_name, "Firmware file name. Allows overriding the " MODULE_PARM_DESC(firmware_name,
"default firmware name\n"); "Firmware file name. Allows overriding the default firmware name\n");
static LIST_HEAD(hybrid_tuner_instance_list); static LIST_HEAD(hybrid_tuner_instance_list);
static DEFINE_MUTEX(xc2028_list_mutex); static DEFINE_MUTEX(xc2028_list_mutex);
...@@ -346,8 +345,7 @@ static int load_all_firmwares(struct dvb_frontend *fe, ...@@ -346,8 +345,7 @@ static int load_all_firmwares(struct dvb_frontend *fe,
n++; n++;
if (n >= n_array) { if (n >= n_array) {
tuner_err("More firmware images in file than " tuner_err("More firmware images in file than were expected!\n");
"were expected!\n");
goto corrupt; goto corrupt;
} }
...@@ -496,8 +494,8 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -496,8 +494,8 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
} }
if (best_nr_matches > 0) { if (best_nr_matches > 0) {
tuner_dbg("Selecting best matching firmware (%d bits) for " tuner_dbg("Selecting best matching firmware (%d bits) for type=",
"type=", best_nr_matches); best_nr_matches);
dump_firm_type(type); dump_firm_type(type);
printk(KERN_CONT printk(KERN_CONT
"(%x), id %016llx:\n", type, (unsigned long long)*id); "(%x), id %016llx:\n", type, (unsigned long long)*id);
...@@ -840,8 +838,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -840,8 +838,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
goto fail; goto fail;
} }
tuner_dbg("Device is Xceive %d version %d.%d, " tuner_dbg("Device is Xceive %d version %d.%d, firmware version %d.%d\n",
"firmware version %d.%d\n",
hwmodel, (version & 0xf000) >> 12, (version & 0xf00) >> 8, hwmodel, (version & 0xf000) >> 12, (version & 0xf00) >> 8,
(version & 0xf0) >> 4, version & 0xf); (version & 0xf0) >> 4, version & 0xf);
...@@ -855,8 +852,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -855,8 +852,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
tuner_err("Incorrect readback of firmware version.\n"); tuner_err("Incorrect readback of firmware version.\n");
goto fail; goto fail;
} else { } else {
tuner_err("Returned an incorrect version. However, " tuner_err("Returned an incorrect version. However, read is not reliable enough. Ignoring it.\n");
"read is not reliable enough. Ignoring it.\n");
hwmodel = 3028; hwmodel = 3028;
} }
} }
...@@ -867,8 +863,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type, ...@@ -867,8 +863,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
priv->hwvers = version & 0xff00; priv->hwvers = version & 0xff00;
} else if (priv->hwmodel == 0 || priv->hwmodel != hwmodel || } else if (priv->hwmodel == 0 || priv->hwmodel != hwmodel ||
priv->hwvers != (version & 0xff00)) { priv->hwvers != (version & 0xff00)) {
tuner_err("Read invalid device hardware information - tuner " tuner_err("Read invalid device hardware information - tuner hung?\n");
"hung?\n");
goto fail; goto fail;
} }
......
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