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);
 
                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;
                        }
                        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;
                        }
                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;
                        }
        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);
        }
 
        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;
        }
 
        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;
        }
 
 
        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);
 
        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;
 
                                !(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;
 
                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;
 
        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));
                /* 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));
 
                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;
        }
                        &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;
                                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 ": <<< ",
 
                        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;
        }
                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;
                }
        } 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;
        }
 
 
        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;
        }
 
 
                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;
        }