mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
V4L/DVB (4949): Cxusb: codingstyle cleanups
Trivial whitespace / 80-column limit cleanups Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky
Mauro Carvalho Chehab
parent
79a54cbd73
commit
f35db23c1b
1 changed files with 60 additions and 50 deletions
|
|
@ -17,9 +17,9 @@
|
|||
* Copyright (C) 2006 Michael Krufky (mkrufky@linuxtv.org)
|
||||
* Copyright (C) 2006 Chris Pascoe (c.pascoe@itee.uq.edu.au)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation, version 2.
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation, version 2.
|
||||
*
|
||||
* see Documentation/dvb/README.dvb-usb for more information
|
||||
*/
|
||||
|
|
@ -34,22 +34,22 @@
|
|||
|
||||
/* debug */
|
||||
int dvb_usb_cxusb_debug;
|
||||
module_param_named(debug,dvb_usb_cxusb_debug, int, 0644);
|
||||
module_param_named(debug, dvb_usb_cxusb_debug, int, 0644);
|
||||
MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." DVB_USB_DEBUG_STATUS);
|
||||
|
||||
static int cxusb_ctrl_msg(struct dvb_usb_device *d,
|
||||
u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
|
||||
u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
|
||||
{
|
||||
int wo = (rbuf == NULL || rlen == 0); /* write-only */
|
||||
u8 sndbuf[1+wlen];
|
||||
memset(sndbuf,0,1+wlen);
|
||||
memset(sndbuf, 0, 1+wlen);
|
||||
|
||||
sndbuf[0] = cmd;
|
||||
memcpy(&sndbuf[1],wbuf,wlen);
|
||||
memcpy(&sndbuf[1], wbuf, wlen);
|
||||
if (wo)
|
||||
dvb_usb_generic_write(d,sndbuf,1+wlen);
|
||||
dvb_usb_generic_write(d, sndbuf, 1+wlen);
|
||||
else
|
||||
dvb_usb_generic_rw(d,sndbuf,1+wlen,rbuf,rlen,0);
|
||||
dvb_usb_generic_rw(d, sndbuf, 1+wlen, rbuf, rlen, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -58,14 +58,14 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d,
|
|||
static void cxusb_gpio_tuner(struct dvb_usb_device *d, int onoff)
|
||||
{
|
||||
struct cxusb_state *st = d->priv;
|
||||
u8 o[2],i;
|
||||
u8 o[2], i;
|
||||
|
||||
if (st->gpio_write_state[GPIO_TUNER] == onoff)
|
||||
return;
|
||||
|
||||
o[0] = GPIO_TUNER;
|
||||
o[1] = onoff;
|
||||
cxusb_ctrl_msg(d,CMD_GPIO_WRITE,o,2,&i,1);
|
||||
cxusb_ctrl_msg(d, CMD_GPIO_WRITE, o, 2, &i, 1);
|
||||
|
||||
if (i != 0x01)
|
||||
deb_info("gpio_write failed.\n");
|
||||
|
|
@ -74,7 +74,8 @@ static void cxusb_gpio_tuner(struct dvb_usb_device *d, int onoff)
|
|||
}
|
||||
|
||||
/* I2C */
|
||||
static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
|
||||
static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
|
||||
int num)
|
||||
{
|
||||
struct dvb_usb_device *d = i2c_get_adapdata(adap);
|
||||
int i;
|
||||
|
|
@ -89,12 +90,12 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
|
|||
|
||||
if (d->udev->descriptor.idVendor == USB_VID_MEDION)
|
||||
switch (msg[i].addr) {
|
||||
case 0x63:
|
||||
cxusb_gpio_tuner(d,0);
|
||||
break;
|
||||
default:
|
||||
cxusb_gpio_tuner(d,1);
|
||||
break;
|
||||
case 0x63:
|
||||
cxusb_gpio_tuner(d, 0);
|
||||
break;
|
||||
default:
|
||||
cxusb_gpio_tuner(d, 1);
|
||||
break;
|
||||
}
|
||||
|
||||
/* read request */
|
||||
|
|
@ -103,26 +104,27 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
|
|||
obuf[0] = msg[i].len;
|
||||
obuf[1] = msg[i+1].len;
|
||||
obuf[2] = msg[i].addr;
|
||||
memcpy(&obuf[3],msg[i].buf,msg[i].len);
|
||||
memcpy(&obuf[3], msg[i].buf, msg[i].len);
|
||||
|
||||
if (cxusb_ctrl_msg(d, CMD_I2C_READ,
|
||||
obuf, 3+msg[i].len,
|
||||
ibuf, 1+msg[i+1].len) < 0)
|
||||
obuf, 3+msg[i].len,
|
||||
ibuf, 1+msg[i+1].len) < 0)
|
||||
break;
|
||||
|
||||
if (ibuf[0] != 0x08)
|
||||
deb_i2c("i2c read may have failed\n");
|
||||
|
||||
memcpy(msg[i+1].buf,&ibuf[1],msg[i+1].len);
|
||||
memcpy(msg[i+1].buf, &ibuf[1], msg[i+1].len);
|
||||
|
||||
i++;
|
||||
} else { /* write */
|
||||
u8 obuf[2+msg[i].len], ibuf;
|
||||
obuf[0] = msg[i].addr;
|
||||
obuf[1] = msg[i].len;
|
||||
memcpy(&obuf[2],msg[i].buf,msg[i].len);
|
||||
memcpy(&obuf[2], msg[i].buf, msg[i].len);
|
||||
|
||||
if (cxusb_ctrl_msg(d,CMD_I2C_WRITE, obuf, 2+msg[i].len, &ibuf,1) < 0)
|
||||
if (cxusb_ctrl_msg(d, CMD_I2C_WRITE, obuf,
|
||||
2+msg[i].len, &ibuf,1) < 0)
|
||||
break;
|
||||
if (ibuf != 0x08)
|
||||
deb_i2c("i2c write may have failed\n");
|
||||
|
|
@ -326,7 +328,6 @@ static int cxusb_mt352_demod_init(struct dvb_frontend* fe)
|
|||
|
||||
static struct cx22702_config cxusb_cx22702_config = {
|
||||
.demod_address = 0x63,
|
||||
|
||||
.output_mode = CX22702_PARALLEL_OUTPUT,
|
||||
};
|
||||
|
||||
|
|
@ -399,7 +400,8 @@ static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap)
|
|||
|
||||
cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, &b, 1);
|
||||
|
||||
if ((adap->fe = dvb_attach(cx22702_attach, &cxusb_cx22702_config, &adap->dev->i2c_adap)) != NULL)
|
||||
if ((adap->fe = dvb_attach(cx22702_attach, &cxusb_cx22702_config,
|
||||
&adap->dev->i2c_adap)) != NULL)
|
||||
return 0;
|
||||
|
||||
return -EIO;
|
||||
|
|
@ -412,7 +414,8 @@ static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_adapter *adap)
|
|||
|
||||
cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);
|
||||
|
||||
if ((adap->fe = dvb_attach(lgdt330x_attach, &cxusb_lgdt3303_config, &adap->dev->i2c_adap)) != NULL)
|
||||
if ((adap->fe = dvb_attach(lgdt330x_attach, &cxusb_lgdt3303_config,
|
||||
&adap->dev->i2c_adap)) != NULL)
|
||||
return 0;
|
||||
|
||||
return -EIO;
|
||||
|
|
@ -426,7 +429,8 @@ static int cxusb_mt352_frontend_attach(struct dvb_usb_adapter *adap)
|
|||
|
||||
cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);
|
||||
|
||||
if ((adap->fe = dvb_attach(mt352_attach, &cxusb_mt352_config, &adap->dev->i2c_adap)) != NULL)
|
||||
if ((adap->fe = dvb_attach(mt352_attach, &cxusb_mt352_config,
|
||||
&adap->dev->i2c_adap)) != NULL)
|
||||
return 0;
|
||||
|
||||
return -EIO;
|
||||
|
|
@ -439,8 +443,11 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_adapter *adap)
|
|||
|
||||
cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);
|
||||
|
||||
if (((adap->fe = dvb_attach(mt352_attach, &cxusb_dee1601_config, &adap->dev->i2c_adap)) != NULL) ||
|
||||
((adap->fe = dvb_attach(zl10353_attach, &cxusb_zl10353_dee1601_config, &adap->dev->i2c_adap)) != NULL))
|
||||
if (((adap->fe = dvb_attach(mt352_attach, &cxusb_dee1601_config,
|
||||
&adap->dev->i2c_adap)) != NULL) ||
|
||||
((adap->fe = dvb_attach(zl10353_attach,
|
||||
&cxusb_zl10353_dee1601_config,
|
||||
&adap->dev->i2c_adap)) != NULL))
|
||||
return 0;
|
||||
|
||||
return -EIO;
|
||||
|
|
@ -452,7 +459,8 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_adapter *adap)
|
|||
*/
|
||||
|
||||
#define BLUEBIRD_01_ID_OFFSET 6638
|
||||
static int bluebird_patch_dvico_firmware_download(struct usb_device *udev, const struct firmware *fw)
|
||||
static int bluebird_patch_dvico_firmware_download(struct usb_device *udev,
|
||||
const struct firmware *fw)
|
||||
{
|
||||
if (fw->size < BLUEBIRD_01_ID_OFFSET + 4)
|
||||
return -EINVAL;
|
||||
|
|
@ -460,10 +468,12 @@ static int bluebird_patch_dvico_firmware_download(struct usb_device *udev, const
|
|||
if (fw->data[BLUEBIRD_01_ID_OFFSET] == (USB_VID_DVICO & 0xff) &&
|
||||
fw->data[BLUEBIRD_01_ID_OFFSET + 1] == USB_VID_DVICO >> 8) {
|
||||
|
||||
fw->data[BLUEBIRD_01_ID_OFFSET + 2] = udev->descriptor.idProduct + 1;
|
||||
fw->data[BLUEBIRD_01_ID_OFFSET + 3] = udev->descriptor.idProduct >> 8;
|
||||
fw->data[BLUEBIRD_01_ID_OFFSET + 2] =
|
||||
udev->descriptor.idProduct + 1;
|
||||
fw->data[BLUEBIRD_01_ID_OFFSET + 3] =
|
||||
udev->descriptor.idProduct >> 8;
|
||||
|
||||
return usb_cypress_load_firmware(udev,fw,CYPRESS_FX2);
|
||||
return usb_cypress_load_firmware(udev, fw, CYPRESS_FX2);
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
|
|
@ -477,7 +487,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties;
|
|||
static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties;
|
||||
|
||||
static int cxusb_probe(struct usb_interface *intf,
|
||||
const struct usb_device_id *id)
|
||||
const struct usb_device_id *id)
|
||||
{
|
||||
if (dvb_usb_device_init(intf,&cxusb_medion_properties,THIS_MODULE,NULL) == 0 ||
|
||||
dvb_usb_device_init(intf,&cxusb_bluebird_lgh064f_properties,THIS_MODULE,NULL) == 0 ||
|
||||
|
|
@ -491,20 +501,20 @@ static int cxusb_probe(struct usb_interface *intf,
|
|||
}
|
||||
|
||||
static struct usb_device_id cxusb_table [] = {
|
||||
{ USB_DEVICE(USB_VID_MEDION, USB_PID_MEDION_MD95700) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM) },
|
||||
{} /* Terminating entry */
|
||||
{ USB_DEVICE(USB_VID_MEDION, USB_PID_MEDION_MD95700) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LG064F_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_LGZ201_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_TH7579_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD) },
|
||||
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM) },
|
||||
{} /* Terminating entry */
|
||||
};
|
||||
MODULE_DEVICE_TABLE (usb, cxusb_table);
|
||||
|
||||
|
|
@ -765,7 +775,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties = {
|
|||
static struct usb_driver cxusb_driver = {
|
||||
.name = "dvb_usb_cxusb",
|
||||
.probe = cxusb_probe,
|
||||
.disconnect = dvb_usb_device_exit,
|
||||
.disconnect = dvb_usb_device_exit,
|
||||
.id_table = cxusb_table,
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue