[media] dvb_usb_v2: use Kernel logging (pr_debug/pr_err/pr_info) (23d8e63a) · Commits · 戴 / test

drivers/media/dvb/dvb-usb/dvb_usb.h

+0 −38

Original line number	Diff line number	Diff line
		@@ -20,46 +20,8 @@
		#include "dvb_demux.h"
		#include "dvb_net.h"
		#include "dmxdev.h"

		#include "dvb-pll.h"

		#include "dvb-usb-ids.h"

		/* debug */
		#ifdef CONFIG_DVB_USB_DEBUG
		#define dprintk(var, level, args...) \
		do { if ((var & level)) { printk(args); } } while (0)

		#define debug_dump(b, l, func) {\
		int loop_; \
		for (loop_ = 0; loop_ < l; loop_++) \
		func("%02x ", b[loop_]); \
		func("\n");\
		}
		#define DVB_USB_DEBUG_STATUS
		#else
		#define dprintk(args...)
		#define debug_dump(b, l, func)

		#define DVB_USB_DEBUG_STATUS " (debugging is not enabled)"

		#endif

		/* generic log methods - taken from usb.h */
		#ifndef DVB_USB_LOG_PREFIX
		#define DVB_USB_LOG_PREFIX "dvb-usb (please define a log prefix)"
		#endif

		#undef err
		#define err(format, arg...) \
		printk(KERN_ERR DVB_USB_LOG_PREFIX ": " format "\n" , ## arg)
		#undef info
		#define info(format, arg...) \
		printk(KERN_INFO DVB_USB_LOG_PREFIX ": " format "\n" , ## arg)
		#undef warn
		#define warn(format, arg...) \
		printk(KERN_WARNING DVB_USB_LOG_PREFIX ": " format "\n" , ## arg)

		struct dvb_usb_driver_info {
		const char *name;
		const char *rc_map;

drivers/media/dvb/dvb-usb/dvb_usb_common.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -9,15 +9,10 @@
		#ifndef DVB_USB_COMMON_H
		#define DVB_USB_COMMON_H

		#define DVB_USB_LOG_PREFIX "dvb_usb"
		#include "dvb_usb.h"

		extern int dvb_usb_debug;
		extern int dvb_usb_disable_rc_polling;

		#define deb_xfer(args...) dprintk(dvb_usb_debug, 0x002, args)
		#define deb_uxfer(args...) dprintk(dvb_usb_debug, 0x100, args)

		/* commonly used methods */
		extern int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff);

drivers/media/dvb/dvb-usb/dvb_usb_dvb.c

+15 −10

Original line number	Diff line number	Diff line
		@@ -83,7 +83,8 @@ 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) {
		err("error while stopping stream.");
		pr_err("%s: error while stopping stream",
		KBUILD_MODNAME);
		return ret;
		}
		}
		@@ -150,7 +151,8 @@ 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) {
		err("could not handle pid_parser");
		pr_err("%s: could not handle pid_parser",
		KBUILD_MODNAME);
		return ret;
		}
		}
		@@ -158,7 +160,8 @@ 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) {
		err("error while enabling fifo.");
		pr_err("%s: error while enabling fifo",
		KBUILD_MODNAME);
		return ret;
		}
		}
		@@ -172,14 +175,14 @@ err:

		static int dvb_usb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
		{
		pr_debug("%s: start pid %04x feedtype %d", __func__, dvbdmxfeed->pid,
		pr_debug("%s: start pid=%04x feedtype=%d\n", __func__, dvbdmxfeed->pid,
		dvbdmxfeed->type);
		return dvb_usb_ctrl_feed(dvbdmxfeed, 1);
		}

		static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
		{
		pr_debug("%s: stop pid %04x feedtype %d", __func__, dvbdmxfeed->pid,
		pr_debug("%s: stop pid=%04x feedtype=%d\n", __func__, dvbdmxfeed->pid,
		dvbdmxfeed->type);
		return dvb_usb_ctrl_feed(dvbdmxfeed, 0);
		}
		@@ -200,9 +203,11 @@ 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)
		info("MAC address: %pM", adap->dvb_adap.proposed_mac);
		pr_info("%s: MAC address: %pM", KBUILD_MODNAME,
		adap->dvb_adap.proposed_mac);
		else
		err("MAC address reading failed.");
		pr_err("%s: MAC address reading failed",
		KBUILD_MODNAME);
		}


		@@ -218,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) {
		err("dvb_dmx_init failed: error %d", ret);
		pr_err("%s: dvb_dmx_init() failed=%d", KBUILD_MODNAME, ret);
		goto err_dmx;
		}

		@@ -227,13 +232,13 @@ 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) {
		err("dvb_dmxdev_init failed: error %d", ret);
		pr_err("%s: dvb_dmxdev_init failed=%d", KBUILD_MODNAME, ret);
		goto err_dmx_dev;
		}

		ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx);
		if (ret < 0) {
		err("dvb_net_init failed: error %d", ret);
		pr_err("%s: dvb_net_init failed=%d", KBUILD_MODNAME, ret);
		goto err_net_init;
		}

drivers/media/dvb/dvb-usb/dvb_usb_i2c.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)

		ret = i2c_add_adapter(&d->i2c_adap);
		if (ret < 0)
		err("could not add i2c adapter");
		pr_err("%s: could not add i2c adapter", KBUILD_MODNAME);

		d->state \|= DVB_USB_STATE_I2C;

drivers/media/dvb/dvb-usb/dvb_usb_init.c

+20 −21

Original line number	Diff line number	Diff line
		@@ -13,13 +13,6 @@
		*/
		#include "dvb_usb_common.h"

		/* debug */
		int dvb_usb_debug;
		module_param_named(debug, dvb_usb_debug, int, 0644);
		MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,pll=4,ts=8"\
		",err=16,rc=32,fw=64,mem=128,uxfer=256 (or-able))."
		DVB_USB_DEBUG_STATUS);

		int dvb_usb_disable_rc_polling;
		module_param_named(disable_rc_polling, dvb_usb_disable_rc_polling, int, 0644);
		MODULE_PARM_DESC(disable_rc_polling,
		@@ -52,13 +45,15 @@ int dvb_usb_download_firmware(struct dvb_usb_device *d)

		ret = request_firmware(&fw, name, &d->udev->dev);
		if (ret < 0) {
		err("did not find the firmware file. (%s) " \
		"Please see linux/Documentation/dvb/ for more" \
		" details on firmware-problems. (%d)", name, ret);
		pr_err("%s: did not find the firmware file. (%s) " \
		"Please see linux/Documentation/dvb/ for " \
		"more details on firmware-problems. (%d)",
		KBUILD_MODNAME, name, ret);
		goto err;
		}

		info("downloading firmware from file '%s'", name);
		pr_info("%s: downloading firmware from file '%s'", KBUILD_MODNAME,
		name);

		ret = d->props.download_firmware(d, fw);

		@@ -99,28 +94,31 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d)
		/* speed - when running at FULL speed we need a HW PID filter */
		if (d->udev->speed == USB_SPEED_FULL &&
		!(adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
		err("This USB2.0 device cannot be run on a" \
		" USB1.1 port. (it lacks a" \
		" hardware 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);
		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)) {
		info("will use the device's hardware PID" \
		" filter (table count: %d).",
		pr_info("%s: will use the device's hardware PID " \
		"filter (table count: %d)",
		KBUILD_MODNAME,
		adap->props.pid_filter_count);
		adap->pid_filtering = 1;
		adap->max_feed_count = adap->props.pid_filter_count;
		} else {
		info("will pass the complete MPEG2 transport" \
		" stream to the software demuxer.");
		pr_info("%s: will pass the complete MPEG2 transport " \
		"stream to the software demuxer",
		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) {
		info("pid filter enabled by module option.");
		pr_info("%s: pid filter enabled by module option",
		KBUILD_MODNAME);
		adap->pid_filtering = 1;
		adap->max_feed_count = adap->props.pid_filter_count;
		}
		@@ -210,7 +208,8 @@ static int dvb_usb_init(struct dvb_usb_device *d)

		ret = dvb_usb_remote_init(d);
		if (ret)
		err("could not initialize remote control.");
		pr_err("%s: could not initialize remote control\n",
		KBUILD_MODNAME);

		dvb_usb_device_power_ctrl(d, 0);

Admin message