Commit 4e60d951 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] dvb_usb_v2: fix issues raised by checkpatch.pl 



Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8b9dff58

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

+26 −16
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ 


#define debug_dump(b, l, func) {\

	int loop_; \

	for (loop_ = 0; loop_ < l; loop_++) func("%02x ", b[loop_]); \

	for (loop_ = 0; loop_ < l; loop_++) \

		func("%02x ", b[loop_]); \

	func("\n");\

}

#define DVB_USB_DEBUG_STATUS
@@ -50,11 +51,14 @@ 
#endif



#undef err

#define err(format, arg...)  printk(KERN_ERR     DVB_USB_LOG_PREFIX ": " format "\n" , ## arg)

#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)

#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)

#define warn(format, arg...) \

	printk(KERN_WARNING DVB_USB_LOG_PREFIX ": " format "\n" , ## arg)



/**

 * struct dvb_usb_device_description - name and its according USB IDs
@@ -120,7 +124,8 @@ struct usb_data_stream_properties { 


/**

 * struct dvb_usb_adapter_properties - properties of a dvb-usb-adapter.

 *    A DVB-USB-Adapter is basically a dvb_adapter which is present on a USB-device.

 * A DVB-USB-Adapter is basically a dvb_adapter which is present on a

 * USB-device.

 * @caps: capabilities of the DVB USB device.

 * @pid_filter_count: number of PID filter position in the optional hardware

 *  PID-filter.
@@ -277,7 +282,8 @@ struct dvb_usb_device_properties { 
	int        usb_ctrl;



#define RECONNECTS_USB                  1

	int        (*download_firmware) (struct dvb_usb_device *, const struct firmware *);

	int (*download_firmware) (struct dvb_usb_device *,

			const struct firmware *);

	int (*get_firmware_name) (struct dvb_usb_device *, const char **);



	int size_of_priv;
@@ -351,7 +357,8 @@ struct usb_data_stream { 
 * @pll_addr: I2C address of the tuner for programming

 * @pll_init: array containing the initialization buffer

 * @pll_desc: pointer to the appropriate struct dvb_pll_desc

 * @tuner_pass_ctrl: called to (de)activate tuner passthru of the demod or the board

 * @tuner_pass_ctrl: called to (de)activate tuner passthru of the demod or

 * the board

 *

 * @dvb_adap: device's dvb_adapter.

 * @dmxdev: device's dmxdev.
@@ -468,11 +475,13 @@ extern int dvb_usbv2_device_init(struct usb_interface *, 
extern void dvb_usbv2_device_exit(struct usb_interface *);



/* the generic read/write method for device control */

extern int dvb_usbv2_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16,int);

extern int dvb_usbv2_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16,

		int);

extern int dvb_usbv2_generic_write(struct dvb_usb_device *, u8 *, u16);



/* commonly used remote control parsing */

extern int dvb_usbv2_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int *);

extern int dvb_usbv2_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *,

		int *);



/* commonly used firmware download types and function */

struct hexline {
@@ -482,8 +491,9 @@ struct hexline { 
	u8 data[255];

	u8 chk;

};

extern int usbv2_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type);

extern int dvb_usbv2_get_hexline(const struct firmware *fw, struct hexline *hx, int *pos);



extern int usbv2_cypress_load_firmware(struct usb_device *udev,

		const struct firmware *fw, int type);

extern int dvb_usbv2_get_hexline(const struct firmware *fw, struct hexline *hx,

		int *pos);



#endif

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

+13 −11
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
 * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)

 * see dvb-usb-init.c for copyright information.

 *

 * a header file containing prototypes and types for internal use of the dvb-usb-lib

 * a header file containing prototypes and types for internal use of the

 * dvb-usb-lib

 */

#ifndef DVB_USB_COMMON_H

#define DVB_USB_COMMON_H
@@ -29,7 +30,8 @@ extern int dvb_usb_download_firmware(struct dvb_usb_device *); 


extern int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff);



extern int usb_urb_init(struct usb_data_stream *stream, struct usb_data_stream_properties *props);

extern int usb_urb_init(struct usb_data_stream *stream,

		struct usb_data_stream_properties *props);

extern int usb_urb_exit(struct usb_data_stream *stream);

extern int usb_urb_submit(struct usb_data_stream *stream);

extern int usb_urb_kill(struct usb_data_stream *stream);

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

+29 −19
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) 
		usb_urb_kill(&adap->fe_adap[adap->active_fe].stream);



		if (adap->props.fe[adap->active_fe].streaming_ctrl != NULL) {

			ret = adap->props.fe[adap->active_fe].streaming_ctrl(adap, 0);

			ret = adap->props.fe[adap->active_fe].streaming_ctrl(

				adap, 0);

			if (ret < 0) {

				err("error while stopping stream.");

				return ret;
@@ -48,7 +49,8 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) 
	if (adap->props.fe[adap->active_fe].caps & DVB_USB_ADAP_HAS_PID_FILTER &&

		adap->fe_adap[adap->active_fe].pid_filtering &&

		adap->props.fe[adap->active_fe].pid_filter != NULL)

		adap->props.fe[adap->active_fe].pid_filter(adap, dvbdmxfeed->index, dvbdmxfeed->pid, onoff);

		adap->props.fe[adap->active_fe].pid_filter(adap,

			dvbdmxfeed->index, dvbdmxfeed->pid, onoff);



	/* start the feed if this was the first feed and there is still a feed

	 * for reception.
@@ -62,7 +64,8 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) 
			adap->props.fe[adap->active_fe].caps &

			DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF &&

			adap->props.fe[adap->active_fe].pid_filter_ctrl != NULL) {

			ret = adap->props.fe[adap->active_fe].pid_filter_ctrl(adap,

			ret = adap->props.fe[adap->active_fe].pid_filter_ctrl(

				adap,

				adap->fe_adap[adap->active_fe].pid_filtering);

			if (ret < 0) {

				err("could not handle pid_parser");
@@ -71,7 +74,8 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) 
		}

		deb_ts("start feeding\n");

		if (adap->props.fe[adap->active_fe].streaming_ctrl != NULL) {

			ret = adap->props.fe[adap->active_fe].streaming_ctrl(adap, 1);

			ret = adap->props.fe[adap->active_fe].streaming_ctrl(

				adap, 1);

			if (ret < 0) {

				err("error while enabling fifo.");

				return ret;
@@ -84,13 +88,15 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) 


static int dvb_usb_start_feed(struct dvb_demux_feed *dvbdmxfeed)

{

	deb_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,dvbdmxfeed->type);

	deb_ts("start pid: 0x%04x, feedtype: %d\n",

		dvbdmxfeed->pid, dvbdmxfeed->type);

	return dvb_usb_ctrl_feed(dvbdmxfeed, 1);

}



static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)

{

	deb_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type);

	deb_ts("stop pid: 0x%04x, feedtype: %d\n",

			dvbdmxfeed->pid, dvbdmxfeed->type);

	return dvb_usb_ctrl_feed(dvbdmxfeed, 0);

}
@@ -109,7 +115,8 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap) 
	adap->dvb_adap.fe_ioctl_override = adap->props.fe_ioctl_override;



	if (adap->dev->props.read_mac_address) {

		if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0)

		if (adap->dev->props.read_mac_address(adap->dev,

				adap->dvb_adap.proposed_mac) == 0)

			info("MAC address: %pM", adap->dvb_adap.proposed_mac);

		else

			err("MAC address reading failed.");
@@ -128,7 +135,8 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap) 
	adap->demux.start_feed       = dvb_usb_start_feed;

	adap->demux.stop_feed        = dvb_usb_stop_feed;

	adap->demux.write_to_decoder = NULL;

	if ((ret = dvb_dmx_init(&adap->demux)) < 0) {

	ret = dvb_dmx_init(&adap->demux);

	if (ret < 0) {

		err("dvb_dmx_init failed: error %d", ret);

		goto err_dmx;

	}
@@ -136,13 +144,14 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap) 
	adap->dmxdev.filternum       = adap->demux.filternum;

	adap->dmxdev.demux           = &adap->demux.dmx;

	adap->dmxdev.capabilities    = 0;

	if ((ret = dvb_dmxdev_init(&adap->dmxdev, &adap->dvb_adap)) < 0) {

	ret = dvb_dmxdev_init(&adap->dmxdev, &adap->dvb_adap);

	if (ret < 0) {

		err("dvb_dmxdev_init failed: error %d", ret);

		goto err_dmx_dev;

	}



	if ((ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net,

						&adap->demux.dmx)) < 0) {

	ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx);

	if (ret < 0) {

		err("dvb_net_init failed: error %d", ret);

		goto err_net_init;

	}
@@ -225,7 +234,7 @@ int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap) 
	for (i = 0; i < adap->props.num_frontends; i++) {



		if (adap->props.fe[i].frontend_attach == NULL) {

			err("strange: '%s' #%d,%d "

			err("strange: '%s' #%d,%d " \

			    "doesn't want to attach a frontend.",

			    adap->dev->desc->name, adap->id, i);
@@ -250,7 +259,8 @@ int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap) 
		adap->fe_adap[i].fe_sleep = adap->fe_adap[i].fe->ops.sleep;

		adap->fe_adap[i].fe->ops.sleep = dvb_usb_fe_sleep;



		if (dvb_register_frontend(&adap->dvb_adap, adap->fe_adap[i].fe)) {

		if (dvb_register_frontend(&adap->dvb_adap,

				adap->fe_adap[i].fe)) {

			err("Frontend %d registration failed.", i);

			dvb_frontend_detach(adap->fe_adap[i].fe);

			adap->fe_adap[i].fe = NULL;

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

+63 −42
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ 
 * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)

 * see dvb-usb-init.c for copyright information.

 *

 * This file contains functions for downloading the firmware to Cypress FX 1 and 2 based devices.

 * This file contains functions for downloading the firmware to Cypress FX 1

 * and 2 based devices.

 *

 * FIXME: This part does actually not belong to dvb-usb, but to the usb-subsystem.

 * FIXME: This part does actually not belong to dvb-usb, but to the

 * usb-subsystem.

 */

#include "dvb_usb_common.h"
@@ -13,27 +15,35 @@ 


struct usb_cypress_controller {

	int id;

	const char *name;       /* name of the usb controller */

	u16 cpu_cs_register;    /* needs to be restarted, when the firmware has been downloaded. */

	/* name of the usb controller */

	const char *name;

	/* needs to be restarted, when the firmware has been downloaded. */

	u16 cpu_cs_register;

};



static struct usb_cypress_controller cypress[] = {

	{ .id = DEVICE_SPECIFIC, .name = "Device specific", .cpu_cs_register = 0 },

	{ .id = CYPRESS_AN2135,  .name = "Cypress AN2135",  .cpu_cs_register = 0x7f92 },

	{ .id = CYPRESS_AN2235,  .name = "Cypress AN2235",  .cpu_cs_register = 0x7f92 },

	{ .id = CYPRESS_FX2,     .name = "Cypress FX2",     .cpu_cs_register = 0xe600 },

	{ .id = DEVICE_SPECIFIC, .name = "Device specific",

		.cpu_cs_register = 0 },

	{ .id = CYPRESS_AN2135,  .name = "Cypress AN2135",

		.cpu_cs_register = 0x7f92 },

	{ .id = CYPRESS_AN2235,  .name = "Cypress AN2235",

		.cpu_cs_register = 0x7f92 },

	{ .id = CYPRESS_FX2,     .name = "Cypress FX2",

		.cpu_cs_register = 0xe600 },

};



/*

 * load a firmware packet to the device

 */

static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 len)

static int usb_cypress_writemem(struct usb_device *udev, u16 addr, u8 *data,

		u8 len)

{

	return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

			0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5000);

}



int usbv2_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)

int usbv2_cypress_load_firmware(struct usb_device *udev,

		const struct firmware *fw, int type)

{

	struct hexline hx;

	u8 reset;
@@ -41,15 +51,18 @@ int usbv2_cypress_load_firmware(struct usb_device *udev, const struct firmware * 


	/* stop the CPU */

	reset = 1;

	if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)

	ret = usb_cypress_writemem(udev, cypress[type].cpu_cs_register,

			&reset, 1);

	if (ret != 1)

		err("could not stop the USB controller CPU.");



	while ((ret = dvb_usbv2_get_hexline(fw, &hx, &pos)) > 0) {

		deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);

		deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",

				hx.addr, hx.len, hx.chk);

		ret = usb_cypress_writemem(udev, hx.addr, hx.data, hx.len);



		if (ret != hx.len) {

			err("error while transferring firmware "

			err("error while transferring firmware " \

				"(transferred size: %d, block size: %d)",

				ret, hx.len);

			ret = -EINVAL;
@@ -64,7 +77,9 @@ int usbv2_cypress_load_firmware(struct usb_device *udev, const struct firmware * 
	if (ret == 0) {

		/* restart the CPU */

		reset = 0;

		if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {

		if (ret || usb_cypress_writemem(udev,

				cypress[type].cpu_cs_register,

				&reset, 1) != 1) {

			err("could not restart the USB controller CPU.");

			ret = -EINVAL;

		}
@@ -85,9 +100,11 @@ int dvb_usb_download_firmware(struct dvb_usb_device *d) 
	if (ret < 0)

		return ret;



	if ((ret = request_firmware(&fw, name, &d->udev->dev)) != 0) {

		err("did not find the firmware file. (%s) "

			"Please see linux/Documentation/dvb/ for more details on firmware-problems. (%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);

		return ret;

	}
@@ -98,13 +115,16 @@ int dvb_usb_download_firmware(struct dvb_usb_device *d) 
	case CYPRESS_AN2135:

	case CYPRESS_AN2235:

	case CYPRESS_FX2:

			ret = usbv2_cypress_load_firmware(d->udev, fw, d->props.usb_ctrl);

		ret = usbv2_cypress_load_firmware(d->udev, fw,

				d->props.usb_ctrl);

		break;

	case DEVICE_SPECIFIC:

		if (d->props.download_firmware)

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

		else {

				err("BUG: driver didn't specified a download_firmware-callback, although it claims to have a DEVICE_SPECIFIC one.");

			err("BUG: driver didn't specified a download_firmware" \

				"-callback, although it claims to have a" \

				" DEVICE_SPECIFIC one.");

			ret = -EINVAL;

		}

		break;
@@ -136,7 +156,8 @@ int dvb_usbv2_get_hexline(const struct firmware *fw, struct hexline *hx, 
	hx->type = b[3];



	if (hx->type == 0x04) {

		/* b[4] and b[5] are the Extended linear address record data field */

		/* b[4] and b[5] are the Extended linear address record data

		 * field */

		hx->addr |= (b[4] << 24) | (b[5] << 16);

/*		hx->len -= 2;

		data_offs += 2; */

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

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d) 


	i2c_set_adapdata(&d->i2c_adap, d);



	if ((ret = i2c_add_adapter(&d->i2c_adap)) < 0)

	ret = i2c_add_adapter(&d->i2c_adap);

	if (ret < 0)

		err("could not add i2c adapter");



	d->state |= DVB_USB_STATE_I2C;