Skip to content

L
linux
Commit 0385443f authored by Jonathan McDowell's avatar Jonathan McDowell Committed by Mauro Carvalho Chehab
Browse files
Options

[media] Remove spurious blank lines in dw2101 kernel messages 

The DW2102 DVB-S/S2 driver uses the info() logging function from
dvb-usb.h. This function already appends a newline to the provided log
message, causing the dmesg output from DW2102 to include blank lines.
Fix this by removing the newline in the calls to info().
Signed-off-by: default avatarJonathan McDowell <noodles@earth.li>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 25f1ec24
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
drivers/media/usb/dvb-usb/dw2102.c
View file @ 0385443f
...@@ -847,7 +847,7 @@ static int su3000_power_ctrl(struct dvb_usb_device *d, int i) ...@@ -847,7 +847,7 @@ static int su3000_power_ctrl(struct dvb_usb_device *d, int i)
struct dw2102_state *state = (struct dw2102_state *)d->priv; struct dw2102_state *state = (struct dw2102_state *)d->priv;
u8 obuf[] = {0xde, 0}; u8 obuf[] = {0xde, 0};
info("%s: %d, initialized %d\n", __func__, i, state->initialized); info("%s: %d, initialized %d", __func__, i, state->initialized);
if (i && !state->initialized) { if (i && !state->initialized) {
state->initialized = 1; state->initialized = 1;
...@@ -894,7 +894,7 @@ static int su3000_identify_state(struct usb_device *udev, ...@@ -894,7 +894,7 @@ static int su3000_identify_state(struct usb_device *udev,
struct dvb_usb_device_description **desc, struct dvb_usb_device_description **desc,
int *cold) int *cold)
{ {
info("%s\n", __func__); info("%s", __func__);
*cold = 0; *cold = 0;
return 0; return 0;
...@@ -1132,7 +1132,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1132,7 +1132,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
tuner_ops->set_bandwidth = stb6100_set_bandw; tuner_ops->set_bandwidth = stb6100_set_bandw;
tuner_ops->get_bandwidth = stb6100_get_bandw; tuner_ops->get_bandwidth = stb6100_get_bandw;
d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
info("Attached STV0900+STB6100!\n"); info("Attached STV0900+STB6100!");
return 0; return 0;
} }
} }
...@@ -1146,7 +1146,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1146,7 +1146,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
&dw2104_stv6110_config, &dw2104_stv6110_config,
&d->dev->i2c_adap)) { &d->dev->i2c_adap)) {
d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
info("Attached STV0900+STV6110A!\n"); info("Attached STV0900+STV6110A!");
return 0; return 0;
} }
} }
...@@ -1157,7 +1157,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1157,7 +1157,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
&d->dev->i2c_adap); &d->dev->i2c_adap);
if (d->fe_adap[0].fe != NULL) { if (d->fe_adap[0].fe != NULL) {
d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
info("Attached cx24116!\n"); info("Attached cx24116!");
return 0; return 0;
} }
} }
...@@ -1168,7 +1168,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1168,7 +1168,7 @@ static int dw2104_frontend_attach(struct dvb_usb_adapter *d)
dvb_attach(ts2020_attach, d->fe_adap[0].fe, dvb_attach(ts2020_attach, d->fe_adap[0].fe,
&dw2104_ts2020_config, &d->dev->i2c_adap); &dw2104_ts2020_config, &d->dev->i2c_adap);
d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
info("Attached DS3000!\n"); info("Attached DS3000!");
return 0; return 0;
} }
...@@ -1187,7 +1187,7 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1187,7 +1187,7 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
&d->dev->i2c_adap); &d->dev->i2c_adap);
if (d->fe_adap[0].fe != NULL) { if (d->fe_adap[0].fe != NULL) {
d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
info("Attached si21xx!\n"); info("Attached si21xx!");
return 0; return 0;
} }
} }
...@@ -1199,7 +1199,7 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1199,7 +1199,7 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
if (dvb_attach(stb6000_attach, d->fe_adap[0].fe, 0x61, if (dvb_attach(stb6000_attach, d->fe_adap[0].fe, 0x61,
&d->dev->i2c_adap)) { &d->dev->i2c_adap)) {
d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
info("Attached stv0288!\n"); info("Attached stv0288!");
return 0; return 0;
} }
} }
...@@ -1211,7 +1211,7 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1211,7 +1211,7 @@ static int dw2102_frontend_attach(struct dvb_usb_adapter *d)
&d->dev->i2c_adap); &d->dev->i2c_adap);
if (d->fe_adap[0].fe != NULL) { if (d->fe_adap[0].fe != NULL) {
d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
info("Attached stv0299!\n"); info("Attached stv0299!");
return 0; return 0;
} }
} }
...@@ -1223,7 +1223,7 @@ static int dw3101_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1223,7 +1223,7 @@ static int dw3101_frontend_attach(struct dvb_usb_adapter *d)
d->fe_adap[0].fe = dvb_attach(tda10023_attach, &dw3101_tda10023_config, d->fe_adap[0].fe = dvb_attach(tda10023_attach, &dw3101_tda10023_config,
&d->dev->i2c_adap, 0x48); &d->dev->i2c_adap, 0x48);
if (d->fe_adap[0].fe != NULL) { if (d->fe_adap[0].fe != NULL) {
info("Attached tda10023!\n"); info("Attached tda10023!");
return 0; return 0;
} }
return -EIO; return -EIO;
...@@ -1237,7 +1237,7 @@ static int zl100313_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1237,7 +1237,7 @@ static int zl100313_frontend_attach(struct dvb_usb_adapter *d)
if (dvb_attach(zl10039_attach, d->fe_adap[0].fe, 0x60, if (dvb_attach(zl10039_attach, d->fe_adap[0].fe, 0x60,
&d->dev->i2c_adap)) { &d->dev->i2c_adap)) {
d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage; d->fe_adap[0].fe->ops.set_voltage = dw210x_set_voltage;
info("Attached zl100313+zl10039!\n"); info("Attached zl100313+zl10039!");
return 0; return 0;
} }
} }
...@@ -1262,7 +1262,7 @@ static int stv0288_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1262,7 +1262,7 @@ static int stv0288_frontend_attach(struct dvb_usb_adapter *d)
dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG);
info("Attached stv0288+stb6000!\n"); info("Attached stv0288+stb6000!");
return 0; return 0;
...@@ -1287,7 +1287,7 @@ static int ds3000_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1287,7 +1287,7 @@ static int ds3000_frontend_attach(struct dvb_usb_adapter *d)
dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG);
info("Attached ds3000+ts2020!\n"); info("Attached ds3000+ts2020!");
return 0; return 0;
} }
...@@ -1305,7 +1305,7 @@ static int prof_7500_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1305,7 +1305,7 @@ static int prof_7500_frontend_attach(struct dvb_usb_adapter *d)
dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG); dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG);
info("Attached STV0900+STB6100A!\n"); info("Attached STV0900+STB6100A!");
return 0; return 0;
} }
...@@ -1353,11 +1353,11 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1353,11 +1353,11 @@ static int su3000_frontend_attach(struct dvb_usb_adapter *d)
if (dvb_attach(ts2020_attach, d->fe_adap[0].fe, if (dvb_attach(ts2020_attach, d->fe_adap[0].fe,
&dw2104_ts2020_config, &dw2104_ts2020_config,
&d->dev->i2c_adap)) { &d->dev->i2c_adap)) {
info("Attached DS3000/TS2020!\n"); info("Attached DS3000/TS2020!");
return 0; return 0;
} }
info("Failed to attach DS3000/TS2020!\n"); info("Failed to attach DS3000/TS2020!");
return -EIO; return -EIO;
} }
...@@ -1402,12 +1402,12 @@ static int t220_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1402,12 +1402,12 @@ static int t220_frontend_attach(struct dvb_usb_adapter *d)
if (d->fe_adap[0].fe != NULL) { if (d->fe_adap[0].fe != NULL) {
if (dvb_attach(tda18271_attach, d->fe_adap[0].fe, 0x60, if (dvb_attach(tda18271_attach, d->fe_adap[0].fe, 0x60,
&d->dev->i2c_adap, &tda18271_config)) { &d->dev->i2c_adap, &tda18271_config)) {
info("Attached TDA18271HD/CXD2820R!\n"); info("Attached TDA18271HD/CXD2820R!");
return 0; return 0;
} }
} }
info("Failed to attach TDA18271HD/CXD2820R!\n"); info("Failed to attach TDA18271HD/CXD2820R!");
return -EIO; return -EIO;
} }
...@@ -1428,11 +1428,11 @@ static int m88rs2000_frontend_attach(struct dvb_usb_adapter *d) ...@@ -1428,11 +1428,11 @@ static int m88rs2000_frontend_attach(struct dvb_usb_adapter *d)
if (dvb_attach(ts2020_attach, d->fe_adap[0].fe, if (dvb_attach(ts2020_attach, d->fe_adap[0].fe,
&dw2104_ts2020_config, &dw2104_ts2020_config,
&d->dev->i2c_adap)) { &d->dev->i2c_adap)) {
info("Attached RS2000/TS2020!\n"); info("Attached RS2000/TS2020!");
return 0; return 0;
} }
info("Failed to attach RS2000/TS2020!\n"); info("Failed to attach RS2000/TS2020!");
return -EIO; return -EIO;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7