evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] dvb_usb_v2: add missing new line for log writings

Browse source 
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2012-06-07 17:52:06 -03:00 • committed by Mauro Carvalho Chehab
parent 3676403764
commit 65de8f978f
6 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/media/dvb/dvb-usb/dvb_usb_common.h
View file

@ -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_init(struct dvb_usb_adapter *adap);
extern int dvb_usb_adapter_stream_exit(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_init(struct dvb_usb_adapter *adap);
extern int dvb_usb_adapter_dvb_exit(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); extern int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap);

17
drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
View file

@ -83,7 +83,7 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
if (adap->props.streaming_ctrl != NULL) { if (adap->props.streaming_ctrl != NULL) {
ret = adap->props.streaming_ctrl(adap, 0); ret = adap->props.streaming_ctrl(adap, 0);
if (ret < 0) { if (ret < 0) {
pr_err("%s: error while stopping stream", pr_err("%s: error while stopping stream\n",
KBUILD_MODNAME); KBUILD_MODNAME);
return ret; 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, ret = adap->props.pid_filter_ctrl(adap,
adap->pid_filtering); adap->pid_filtering);
if (ret < 0) { if (ret < 0) {
pr_err("%s: could not handle pid_parser", pr_err("%s: could not handle pid_parser\n",
KBUILD_MODNAME); KBUILD_MODNAME);
return ret; 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) { if (adap->props.streaming_ctrl != NULL) {
ret = adap->props.streaming_ctrl(adap, 1); ret = adap->props.streaming_ctrl(adap, 1);
if (ret < 0) { if (ret < 0) {
pr_err("%s: error while enabling fifo", pr_err("%s: error while enabling fifo\n",
KBUILD_MODNAME); KBUILD_MODNAME);
return ret; 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) {
if (adap->dev->props.read_mac_address(adap->dev, if (adap->dev->props.read_mac_address(adap->dev,
adap->dvb_adap.proposed_mac) == 0) 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); adap->dvb_adap.proposed_mac);
else else
pr_err("%s: MAC address reading failed", pr_err("%s: MAC address reading failed\n",
KBUILD_MODNAME); KBUILD_MODNAME);
} }
@ -223,7 +223,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
adap->demux.write_to_decoder = NULL; adap->demux.write_to_decoder = NULL;
ret = dvb_dmx_init(&adap->demux); ret = dvb_dmx_init(&adap->demux);
if (ret < 0) { 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; goto err_dmx;
} }
@ -232,13 +232,14 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
adap->dmxdev.capabilities = 0; adap->dmxdev.capabilities = 0;
ret = dvb_dmxdev_init(&adap->dmxdev, &adap->dvb_adap); ret = dvb_dmxdev_init(&adap->dmxdev, &adap->dvb_adap);
if (ret < 0) { 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; goto err_dmx_dev;
} }
ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx); ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx);
if (ret < 0) { 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; goto err_net_init;
} }

14
drivers/media/dvb/dvb-usb/dvb_usb_init.c
View file

@ -47,12 +47,12 @@ int dvb_usb_download_firmware(struct dvb_usb_device *d)
if (ret < 0) { if (ret < 0) {
pr_err("%s: did not find the firmware file. (%s) " \ pr_err("%s: did not find the firmware file. (%s) " \
"Please see linux/Documentation/dvb/ for " \ "Please see linux/Documentation/dvb/ for " \
"more details on firmware-problems. (%d)", "more details on firmware-problems. (%d)\n",
KBUILD_MODNAME, name, ret); KBUILD_MODNAME, name, ret);
goto err; goto err;
} }
pr_info("%s: downloading firmware from file '%s'", KBUILD_MODNAME, pr_info("%s: downloading firmware from file '%s'\n", KBUILD_MODNAME,
name); name);
ret = d->props.download_firmware(d, fw); 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); ret = i2c_add_adapter(&d->i2c_adap);
if (ret < 0) 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; 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)) { !(adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
pr_err("%s: this USB2.0 device cannot be run on a " \ pr_err("%s: this USB2.0 device cannot be run on a " \
"USB1.1 port (it lacks a hardware " \ "USB1.1 port (it lacks a hardware " \
"PID filter)", KBUILD_MODNAME); "PID filter)\n", KBUILD_MODNAME);
return -ENODEV; return -ENODEV;
} else if ((d->udev->speed == USB_SPEED_FULL && } else if ((d->udev->speed == USB_SPEED_FULL &&
adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) || adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
(adap->props.caps & DVB_USB_ADAP_NEED_PID_FILTERING)) { (adap->props.caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
pr_info("%s: will use the device's hardware PID " \ pr_info("%s: will use the device's hardware PID " \
"filter (table count: %d)", "filter (table count: %d)\n",
KBUILD_MODNAME, KBUILD_MODNAME,
adap->props.pid_filter_count); adap->props.pid_filter_count);
adap->pid_filtering = 1; adap->pid_filtering = 1;
adap->max_feed_count = adap->props.pid_filter_count; adap->max_feed_count = adap->props.pid_filter_count;
} else { } else {
pr_info("%s: will pass the complete MPEG2 transport " \ pr_info("%s: will pass the complete MPEG2 transport " \
"stream to the software demuxer", "stream to the software demuxer\n",
KBUILD_MODNAME); KBUILD_MODNAME);
adap->pid_filtering = 0; adap->pid_filtering = 0;
adap->max_feed_count = 255; 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 && if (!adap->pid_filtering && dvb_usb_force_pid_filter_usage &&
adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) { 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); KBUILD_MODNAME);
adap->pid_filtering = 1; adap->pid_filtering = 1;
adap->max_feed_count = adap->props.pid_filter_count; adap->max_feed_count = adap->props.pid_filter_count;

4
drivers/media/dvb/dvb-usb/dvb_usb_remote.c
View file

@ -32,7 +32,7 @@ static void dvb_usb_read_remote_control(struct work_struct *work)
ret = d->rc.query(d); ret = d->rc.query(d);
if (ret < 0) if (ret < 0)
pr_err("%s: error %d while querying for an remote control " \ 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, schedule_delayed_work(&d->rc_query_work,
msecs_to_jiffies(d->rc.interval)); 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 */ /* initialize a work queue for handling polling */
INIT_DELAYED_WORK(&d->rc_query_work, INIT_DELAYED_WORK(&d->rc_query_work,
dvb_usb_read_remote_control); 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); KBUILD_MODNAME, d->rc.interval);
schedule_delayed_work(&d->rc_query_work, schedule_delayed_work(&d->rc_query_work,
msecs_to_jiffies(d->rc.interval)); msecs_to_jiffies(d->rc.interval));

6
drivers/media/dvb/dvb-usb/dvb_usb_urb.c
View file

@ -17,7 +17,7 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
return -EINVAL; return -EINVAL;
if (d->props.generic_bulk_ctrl_endpoint == 0) { 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); KBUILD_MODNAME);
return -EINVAL; return -EINVAL;
} }
@ -34,7 +34,7 @@ int dvb_usbv2_generic_rw(struct dvb_usb_device *d, u8 *wbuf, u16 wlen, u8 *rbuf,
&actlen, 2000); &actlen, 2000);
if (ret) 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); ret, wlen, actlen);
else else
ret = actlen != wlen ? -1 : 0; 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); rbuf, rlen, &actlen, 2000);
if (ret) if (ret)
pr_err("%s: recv bulk message failed: %d", pr_err("%s: recv bulk message failed: %d\n",
KBUILD_MODNAME, ret); KBUILD_MODNAME, ret);
else else
print_hex_dump(KERN_DEBUG, KBUILD_MODNAME ": <<< ", print_hex_dump(KERN_DEBUG, KBUILD_MODNAME ": <<< ",

12
drivers/media/dvb/dvb-usb/usb_urb.c
View file

@ -65,7 +65,7 @@ static void usb_urb_complete(struct urb *urb)
stream->complete(stream, b, urb->actual_length); stream->complete(stream, b, urb->actual_length);
break; break;
default: default:
pr_err("%s: unknown endpoint type in completition handler", pr_err("%s: unknown endpoint type in completition handler\n",
KBUILD_MODNAME); KBUILD_MODNAME);
return; return;
} }
@ -100,7 +100,7 @@ int usb_urb_submit(struct usb_data_stream *stream,
ret = usb_submit_urb(stream->urb_list[i], GFP_ATOMIC); ret = usb_submit_urb(stream->urb_list[i], GFP_ATOMIC);
if (ret) { if (ret) {
pr_err("%s: could not submit URB no. %d - get them " \ 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); usb_urb_kill(stream);
return ret; return ret;
} }
@ -264,14 +264,14 @@ int usb_urb_reconfig(struct usb_data_stream *stream,
} else if (props->type == USB_ISOC) { } else if (props->type == USB_ISOC) {
buf_size = props->u.isoc.framesize * props->u.isoc.framesperurb; buf_size = props->u.isoc.framesize * props->u.isoc.framesperurb;
} else { } else {
pr_err("%s: invalid endpoint type=%d", KBUILD_MODNAME, pr_err("%s: invalid endpoint type=%d\n", KBUILD_MODNAME,
props->type); props->type);
return -EINVAL; return -EINVAL;
} }
if (stream->buf_num < props->count || stream->buf_size < buf_size) { if (stream->buf_num < props->count || stream->buf_size < buf_size) {
pr_err("%s: cannot reconfigure as allocated buffers are too " \ pr_err("%s: cannot reconfigure as allocated buffers are too " \
"small", KBUILD_MODNAME); "small\n", KBUILD_MODNAME);
return -EINVAL; return -EINVAL;
} }
@ -320,7 +320,7 @@ int usb_urb_init(struct usb_data_stream *stream,
if (stream->complete == NULL) { if (stream->complete == NULL) {
pr_err("%s: there is no data callback - this doesn't make " \ pr_err("%s: there is no data callback - this doesn't make " \
"sense", KBUILD_MODNAME); "sense\n", KBUILD_MODNAME);
return -EINVAL; return -EINVAL;
} }
@ -341,7 +341,7 @@ int usb_urb_init(struct usb_data_stream *stream,
return usb_urb_alloc_isoc_urbs(stream); return usb_urb_alloc_isoc_urbs(stream);
default: default:
pr_err("%s: unknown URB-type for data transfer", pr_err("%s: unknown URB-type for data transfer\n",
KBUILD_MODNAME); KBUILD_MODNAME);
return -EINVAL; return -EINVAL;
} }