aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/media/dvb/dvb-usb/dvb_usb_common.h3
-rw-r--r--drivers/media/dvb/dvb-usb/dvb_usb_dvb.c17
-rw-r--r--drivers/media/dvb/dvb-usb/dvb_usb_init.c14
-rw-r--r--drivers/media/dvb/dvb-usb/dvb_usb_remote.c4
-rw-r--r--drivers/media/dvb/dvb-usb/dvb_usb_urb.c6
-rw-r--r--drivers/media/dvb/dvb-usb/usb_urb.c12
6 files changed, 27 insertions, 29 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_common.h b/drivers/media/dvb/dvb-usb/dvb_usb_common.h
index 058fa8c06846..c3035a154860 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_common.h
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_common.h
@@ -26,9 +26,6 @@ extern int usb_urb_kill(struct usb_data_stream *stream);
extern int dvb_usb_adapter_stream_init(struct dvb_usb_adapter *adap);
extern int dvb_usb_adapter_stream_exit(struct dvb_usb_adapter *adap);
-extern int dvb_usb_i2c_init(struct dvb_usb_device *);
-extern int dvb_usb_i2c_exit(struct dvb_usb_device *);
-
extern int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap);
extern int dvb_usb_adapter_dvb_exit(struct dvb_usb_adapter *adap);
extern int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap);
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c b/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
index b9524326c8ba..a2ec0427f833 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
@@ -83,7 +83,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
if (adap->props.streaming_ctrl != NULL) {
ret = adap->props.streaming_ctrl(adap, 0);
if (ret < 0) {
- pr_err("%s: error while stopping stream",
+ pr_err("%s: error while stopping stream\n",
KBUILD_MODNAME);
return ret;
}
@@ -151,7 +151,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
ret = adap->props.pid_filter_ctrl(adap,
adap->pid_filtering);
if (ret < 0) {
- pr_err("%s: could not handle pid_parser",
+ pr_err("%s: could not handle pid_parser\n",
KBUILD_MODNAME);
return ret;
}
@@ -160,7 +160,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
if (adap->props.streaming_ctrl != NULL) {
ret = adap->props.streaming_ctrl(adap, 1);
if (ret < 0) {
- pr_err("%s: error while enabling fifo",
+ pr_err("%s: error while enabling fifo\n",
KBUILD_MODNAME);
return ret;
}
@@ -203,10 +203,10 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
if (adap->dev->props.read_mac_address) {
if (adap->dev->props.read_mac_address(adap->dev,
adap->dvb_adap.proposed_mac) == 0)
- pr_info("%s: MAC address: %pM", KBUILD_MODNAME,
+ pr_info("%s: MAC address: %pM\n", KBUILD_MODNAME,
adap->dvb_adap.proposed_mac);
else
- pr_err("%s: MAC address reading failed",
+ pr_err("%s: MAC address reading failed\n",
KBUILD_MODNAME);
}
@@ -223,7 +223,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
adap->demux.write_to_decoder = NULL;
ret = dvb_dmx_init(&adap->demux);
if (ret < 0) {
- pr_err("%s: dvb_dmx_init() failed=%d", KBUILD_MODNAME, ret);
+ pr_err("%s: dvb_dmx_init() failed=%d\n", KBUILD_MODNAME, ret);
goto err_dmx;
}
@@ -232,13 +232,14 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
adap->dmxdev.capabilities = 0;
ret = dvb_dmxdev_init(&adap->dmxdev, &adap->dvb_adap);
if (ret < 0) {
- pr_err("%s: dvb_dmxdev_init failed=%d", KBUILD_MODNAME, ret);
+ pr_err("%s: dvb_dmxdev_init() failed=%d\n", KBUILD_MODNAME,
+ ret);
goto err_dmx_dev;
}
ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx);
if (ret < 0) {
- pr_err("%s: dvb_net_init failed=%d", KBUILD_MODNAME, ret);
+ pr_err("%s: dvb_net_init() failed=%d\n", KBUILD_MODNAME, ret);
goto err_net_init;
}
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 7c98a40562e4..0a452fc4edc8 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -47,12 +47,12 @@ int dvb_usb_download_firmware(struct dvb_usb_device *d)
if (ret < 0) {
pr_err("%s: did not find the firmware file. (%s) " \
"Please see linux/Documentation/dvb/ for " \
- "more details on firmware-problems. (%d)",
+ "more details on firmware-problems. (%d)\n",
KBUILD_MODNAME, name, ret);
goto err;
}
- pr_info("%s: downloading firmware from file '%s'", KBUILD_MODNAME,
+ pr_info("%s: downloading firmware from file '%s'\n", KBUILD_MODNAME,
name);
ret = d->props.download_firmware(d, fw);
@@ -84,7 +84,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
ret = i2c_add_adapter(&d->i2c_adap);
if (ret < 0)
- pr_err("%s: could not add i2c adapter", KBUILD_MODNAME);
+ pr_err("%s: could not add i2c adapter\n", KBUILD_MODNAME);
d->state |= DVB_USB_STATE_I2C;
@@ -127,20 +127,20 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d)
!(adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
pr_err("%s: this USB2.0 device cannot be run on a " \
"USB1.1 port (it lacks a hardware " \
- "PID filter)", KBUILD_MODNAME);
+ "PID filter)\n", KBUILD_MODNAME);
return -ENODEV;
} else if ((d->udev->speed == USB_SPEED_FULL &&
adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
(adap->props.caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
pr_info("%s: will use the device's hardware PID " \
- "filter (table count: %d)",
+ "filter (table count: %d)\n",
KBUILD_MODNAME,
adap->props.pid_filter_count);
adap->pid_filtering = 1;
adap->max_feed_count = adap->props.pid_filter_count;
} else {
pr_info("%s: will pass the complete MPEG2 transport " \
- "stream to the software demuxer",
+ "stream to the software demuxer\n",
KBUILD_MODNAME);
adap->pid_filtering = 0;
adap->max_feed_count = 255;
@@ -148,7 +148,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d)
if (!adap->pid_filtering && dvb_usb_force_pid_filter_usage &&
adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) {
- pr_info("%s: pid filter enabled by module option",
+ pr_info("%s: pid filter enabled by module option\n",
KBUILD_MODNAME);
adap->pid_filtering = 1;
adap->max_feed_count = adap->props.pid_filter_count;
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_remote.c b/drivers/media/dvb/dvb-usb/dvb_usb_remote.c
index f64982a1cd83..8c7f1221f89a 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_remote.c
@@ -32,7 +32,7 @@ static void dvb_usb_read_remote_control(struct work_struct *work)
ret = d->rc.query(d);
if (ret < 0)
pr_err("%s: error %d while querying for an remote control " \
- "event", KBUILD_MODNAME, ret);
+ "event\n", KBUILD_MODNAME, ret);
schedule_delayed_work(&d->rc_query_work,
msecs_to_jiffies(d->rc.interval));
@@ -90,7 +90,7 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
/* initialize a work queue for handling polling */
INIT_DELAYED_WORK(&d->rc_query_work,
dvb_usb_read_remote_control);
- pr_info("%s: schedule remote query interval to %d msecs",
+ pr_info("%s: schedule remote query interval to %d msecs\n",
KBUILD_MODNAME, d->rc.interval);
schedule_delayed_work(&d->rc_query_work,
msecs_to_jiffies(d->rc.interval));
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_urb.c b/drivers/media/dvb/dvb-usb/dvb_usb_urb.c
index e28a4dc3cb04..f2dc6b928ebe 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_urb.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_urb.c
@@ -17,7 +17,7 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
return -EINVAL;
if (d->props.generic_bulk_ctrl_endpoint == 0) {
- pr_err("%s: endpoint for generic control not specified",
+ pr_err("%s: endpoint for generic control not specified\n",
KBUILD_MODNAME);
return -EINVAL;
}
@@ -34,7 +34,7 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
&actlen, 2000);
if (ret)
- pr_err("%s: bulk message failed: %d (%d/%d)", KBUILD_MODNAME,
+ pr_err("%s: bulk message failed: %d (%d/%d)\n", KBUILD_MODNAME,
ret, wlen, actlen);
else
ret = actlen != wlen ? -1 : 0;
@@ -51,7 +51,7 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
rbuf, rlen, &actlen, 2000);
if (ret)
- pr_err("%s: recv bulk message failed: %d",
+ pr_err("%s: recv bulk message failed: %d\n",
KBUILD_MODNAME, ret);
else
print_hex_dump(KERN_DEBUG, KBUILD_MODNAME ": <<< ",
diff --git a/drivers/media/dvb/dvb-usb/usb_urb.c b/drivers/media/dvb/dvb-usb/usb_urb.c
index baa2938db151..396c755c3ad0 100644
--- a/drivers/media/dvb/dvb-usb/usb_urb.c
+++ b/drivers/media/dvb/dvb-usb/usb_urb.c
@@ -65,7 +65,7 @@ static void usb_urb_complete(struct urb *urb)
stream->complete(stream, b, urb->actual_length);
break;
default:
- pr_err("%s: unknown endpoint type in completition handler",
+ pr_err("%s: unknown endpoint type in completition handler\n",
KBUILD_MODNAME);
return;
}
@@ -100,7 +100,7 @@ int usb_urb_submit(struct usb_data_stream *stream,
ret = usb_submit_urb(stream->urb_list[i], GFP_ATOMIC);
if (ret) {
pr_err("%s: could not submit URB no. %d - get them " \
- "all back", KBUILD_MODNAME, i);
+ "all back\n", KBUILD_MODNAME, i);
usb_urb_kill(stream);
return ret;
}
@@ -264,14 +264,14 @@ int usb_urb_reconfig(struct usb_data_stream *stream,
} else if (props->type == USB_ISOC) {
buf_size = props->u.isoc.framesize * props->u.isoc.framesperurb;
} else {
- pr_err("%s: invalid endpoint type=%d", KBUILD_MODNAME,
+ pr_err("%s: invalid endpoint type=%d\n", KBUILD_MODNAME,
props->type);
return -EINVAL;
}
if (stream->buf_num < props->count || stream->buf_size < buf_size) {
pr_err("%s: cannot reconfigure as allocated buffers are too " \
- "small", KBUILD_MODNAME);
+ "small\n", KBUILD_MODNAME);
return -EINVAL;
}
@@ -320,7 +320,7 @@ int usb_urb_init(struct usb_data_stream *stream,
if (stream->complete == NULL) {
pr_err("%s: there is no data callback - this doesn't make " \
- "sense", KBUILD_MODNAME);
+ "sense\n", KBUILD_MODNAME);
return -EINVAL;
}
@@ -341,7 +341,7 @@ int usb_urb_init(struct usb_data_stream *stream,
return usb_urb_alloc_isoc_urbs(stream);
default:
- pr_err("%s: unknown URB-type for data transfer",
+ pr_err("%s: unknown URB-type for data transfer\n",
KBUILD_MODNAME);
return -EINVAL;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 02:42:36 +0000