mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
media: ddbridge: fixup checkpatch-strict issues
Fixes several alignment, braces, space-before-cast, camelcase et al issues reported by checkpatch --strict, plus a few more checkpatch didn't report. Three checks are left after this though: - one CamelCase in ddbridge-core, related to defines/vars/enums referenced from the stv090x demod driver - one macro argument reuse in ddbridge-core aswell - one unbalanced braces around else in ddbridge-main, which is due to #ifdefs related to CONFIG_PCI_MSI, which preferrably should be kept as-is for readability. Signed-off-by: Daniel Scheller <d.scheller@gmx.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
1d8343aa35
commit
757d78d35a
7 changed files with 173 additions and 158 deletions
|
@ -112,7 +112,6 @@ static void ddb_set_dma_tables(struct ddb *dev)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/****************************************************************************/
|
||||
/****************************************************************************/
|
||||
|
@ -210,9 +209,10 @@ static int ddb_redirect(u32 i, u32 p)
|
|||
if (input->redi) {
|
||||
input2->redi = input->redi;
|
||||
input->redi = NULL;
|
||||
} else
|
||||
} else {
|
||||
input2->redi = input;
|
||||
}
|
||||
}
|
||||
input->redo = port->output;
|
||||
port->output->redi = input;
|
||||
|
||||
|
@ -357,9 +357,9 @@ static void calc_con(struct ddb_output *output, u32 *con, u32 *con2, u32 flags)
|
|||
max_bitrate = 0;
|
||||
gap = 0;
|
||||
if (bitrate != 72000) {
|
||||
if (bitrate >= 96000)
|
||||
if (bitrate >= 96000) {
|
||||
*con |= 0x800;
|
||||
else {
|
||||
} else {
|
||||
*con |= 0x1000;
|
||||
nco = (bitrate * 8192 + 71999)
|
||||
/ 72000;
|
||||
|
@ -506,7 +506,6 @@ static void ddb_input_start(struct ddb_input *input)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
static void ddb_input_start_all(struct ddb_input *input)
|
||||
{
|
||||
struct ddb_input *i = input;
|
||||
|
@ -572,7 +571,7 @@ static ssize_t ddb_output_write(struct ddb_output *output,
|
|||
while (left) {
|
||||
len = output->dma->size - output->dma->coff;
|
||||
if ((((output->dma->cbuf + 1) % output->dma->num) == idx) &&
|
||||
(off == 0)) {
|
||||
off == 0) {
|
||||
if (len <= 188)
|
||||
break;
|
||||
len -= 188;
|
||||
|
@ -593,7 +592,8 @@ static ssize_t ddb_output_write(struct ddb_output *output,
|
|||
buf, len))
|
||||
return -EIO;
|
||||
if (alt_dma)
|
||||
dma_sync_single_for_device(dev->dev,
|
||||
dma_sync_single_for_device(
|
||||
dev->dev,
|
||||
output->dma->pbuf[output->dma->cbuf],
|
||||
output->dma->size, DMA_TO_DEVICE);
|
||||
left -= len;
|
||||
|
@ -648,7 +648,8 @@ static ssize_t ddb_input_read(struct ddb_input *input,
|
|||
if (free > left)
|
||||
free = left;
|
||||
if (alt_dma)
|
||||
dma_sync_single_for_cpu(dev->dev,
|
||||
dma_sync_single_for_cpu(
|
||||
dev->dev,
|
||||
input->dma->pbuf[input->dma->cbuf],
|
||||
input->dma->size, DMA_FROM_DEVICE);
|
||||
ret = copy_to_user(buf, input->dma->vbuf[input->dma->cbuf] +
|
||||
|
@ -792,8 +793,10 @@ static int ts_open(struct inode *inode, struct file *file)
|
|||
} else if ((file->f_flags & O_ACCMODE) == O_WRONLY) {
|
||||
if (!output)
|
||||
return -EINVAL;
|
||||
} else
|
||||
} else {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
err = dvb_generic_open(inode, file);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
@ -822,7 +825,6 @@ static struct dvb_device dvbdev_ci = {
|
|||
.fops = &ci_fops,
|
||||
};
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/****************************************************************************/
|
||||
|
||||
|
@ -1017,7 +1019,7 @@ static int tuner_attach_tda18212(struct ddb_input *input, u32 porttype)
|
|||
|
||||
/* perform tuner init/attach */
|
||||
client = i2c_new_device(adapter, &board_info);
|
||||
if (client == NULL || client->dev.driver == NULL)
|
||||
if (!client || !client->dev.driver)
|
||||
goto err;
|
||||
|
||||
if (!try_module_get(client->dev.driver->owner)) {
|
||||
|
@ -1262,7 +1264,8 @@ static void dvb_input_detach(struct ddb_input *input)
|
|||
dvb_frontend_detach(dvb->fe2);
|
||||
if (dvb->fe)
|
||||
dvb_frontend_detach(dvb->fe);
|
||||
dvb->fe = dvb->fe2 = NULL;
|
||||
dvb->fe = NULL;
|
||||
dvb->fe2 = NULL;
|
||||
/* fallthrough */
|
||||
case 0x20:
|
||||
client = dvb->i2c_client[0];
|
||||
|
@ -1406,7 +1409,8 @@ static int dvb_input_attach(struct ddb_input *input)
|
|||
DMX_SECTION_FILTERING | DMX_MEMORY_BASED_FILTERING;
|
||||
dvbdemux->start_feed = start_feed;
|
||||
dvbdemux->stop_feed = stop_feed;
|
||||
dvbdemux->filternum = dvbdemux->feednum = 256;
|
||||
dvbdemux->filternum = 256;
|
||||
dvbdemux->feednum = 256;
|
||||
ret = dvb_dmx_init(dvbdemux);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
@ -1433,7 +1437,8 @@ static int dvb_input_attach(struct ddb_input *input)
|
|||
return ret;
|
||||
dvb->attached = 0x20;
|
||||
|
||||
dvb->fe = dvb->fe2 = NULL;
|
||||
dvb->fe = NULL;
|
||||
dvb->fe2 = NULL;
|
||||
switch (port->type) {
|
||||
case DDB_TUNER_MXL5XX:
|
||||
if (fe_attach_mxl5xx(input) < 0)
|
||||
|
@ -1715,7 +1720,6 @@ static int init_xo2_ci(struct ddb_port *port)
|
|||
i2c_write_reg(i2c, 0x10, 0x08, 3);
|
||||
usleep_range(2000, 3000);
|
||||
|
||||
|
||||
/* speed: 0=55,1=75,2=90,3=104 MBit/s */
|
||||
i2c_write_reg(i2c, 0x10, 0x09, 1);
|
||||
|
||||
|
@ -1909,7 +1913,6 @@ static void ddb_port_probe(struct ddb_port *port)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/****************************************************************************/
|
||||
/****************************************************************************/
|
||||
|
@ -1999,7 +2002,7 @@ static int slot_reset(struct dvb_ca_en50221 *ca, int slot)
|
|||
CI_CONTROL(ci->nr));
|
||||
ddbwritel(ci->port->dev, CI_ENABLE | CI_POWER_ON | CI_RESET_CAM,
|
||||
CI_CONTROL(ci->nr));
|
||||
udelay(20);
|
||||
usleep_range(20, 25);
|
||||
ddbwritel(ci->port->dev, CI_ENABLE | CI_POWER_ON,
|
||||
CI_CONTROL(ci->nr));
|
||||
return 0;
|
||||
|
@ -2323,7 +2326,6 @@ void ddb_ports_detach(struct ddb *dev)
|
|||
dvb_unregister_adapters(dev);
|
||||
}
|
||||
|
||||
|
||||
/* Copy input DMA pointers to output DMA and ACK. */
|
||||
|
||||
static void input_write_output(struct ddb_input *input,
|
||||
|
@ -2350,16 +2352,18 @@ static void input_write_dvb(struct ddb_input *input,
|
|||
struct ddb *dev = input->port->dev;
|
||||
int ack = 1;
|
||||
|
||||
dma = dma2 = input->dma;
|
||||
/* if there also is an output connected, do not ACK.
|
||||
dma = input->dma;
|
||||
dma2 = input->dma;
|
||||
/*
|
||||
* if there also is an output connected, do not ACK.
|
||||
* input_write_output will ACK.
|
||||
*/
|
||||
if (input->redo) {
|
||||
dma2 = input->redo->dma;
|
||||
ack = 0;
|
||||
}
|
||||
while (dma->cbuf != ((dma->stat >> 11) & 0x1f)
|
||||
|| (4 & dma->ctrl)) {
|
||||
while (dma->cbuf != ((dma->stat >> 11) & 0x1f) ||
|
||||
(4 & dma->ctrl)) {
|
||||
if (4 & dma->ctrl) {
|
||||
/* dev_err(dev->dev, "Overflow dma %d\n", dma->nr); */
|
||||
ack = 1;
|
||||
|
@ -2407,8 +2411,8 @@ static void input_handler(unsigned long data)
|
|||
struct ddb_input *input = (struct ddb_input *)data;
|
||||
struct ddb_dma *dma = input->dma;
|
||||
|
||||
|
||||
/* If there is no input connected, input_tasklet() will
|
||||
/*
|
||||
* If there is no input connected, input_tasklet() will
|
||||
* just copy pointers and ACK. So, there is no need to go
|
||||
* through the tasklet scheduler.
|
||||
*/
|
||||
|
@ -2606,7 +2610,7 @@ void ddb_ports_init(struct ddb *dev)
|
|||
port->dvb[0].adap = &dev->adap[2 * p];
|
||||
port->dvb[1].adap = &dev->adap[2 * p + 1];
|
||||
|
||||
if ((port->class == DDB_PORT_NONE) && i && p &&
|
||||
if (port->class == DDB_PORT_NONE && i && p &&
|
||||
dev->port[p - 1].type == DDB_CI_EXTERNAL_XO2) {
|
||||
port->class = DDB_PORT_CI;
|
||||
port->type = DDB_CI_EXTERNAL_XO2_B;
|
||||
|
@ -3073,7 +3077,6 @@ static ssize_t led_show(struct device *device,
|
|||
return sprintf(buf, "%d\n", dev->leds & (1 << num) ? 1 : 0);
|
||||
}
|
||||
|
||||
|
||||
static void ddb_set_led(struct ddb *dev, int num, int val)
|
||||
{
|
||||
if (!dev->link[0].info->led_num)
|
||||
|
@ -3205,7 +3208,6 @@ static ssize_t gap_show(struct device *device,
|
|||
int num = attr->attr.name[3] - 0x30;
|
||||
|
||||
return sprintf(buf, "%d\n", dev->port[num].gap);
|
||||
|
||||
}
|
||||
|
||||
static ssize_t gap_store(struct device *device, struct device_attribute *attr,
|
||||
|
@ -3384,7 +3386,7 @@ static void ddb_device_attrs_del(struct ddb *dev)
|
|||
device_remove_file(dev->ddb_dev, &ddb_attrs_snr[i]);
|
||||
device_remove_file(dev->ddb_dev, &ddb_attrs_ctemp[i]);
|
||||
}
|
||||
for (i = 0; ddb_attrs[i].attr.name != NULL; i++)
|
||||
for (i = 0; ddb_attrs[i].attr.name; i++)
|
||||
device_remove_file(dev->ddb_dev, &ddb_attrs[i]);
|
||||
}
|
||||
|
||||
|
@ -3392,7 +3394,7 @@ static int ddb_device_attrs_add(struct ddb *dev)
|
|||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; ddb_attrs[i].attr.name != NULL; i++)
|
||||
for (i = 0; ddb_attrs[i].attr.name; i++)
|
||||
if (device_create_file(dev->ddb_dev, &ddb_attrs[i]))
|
||||
goto fail;
|
||||
for (i = 0; i < dev->link[0].info->temp_num; i++)
|
||||
|
@ -3444,8 +3446,9 @@ int ddb_device_create(struct ddb *dev)
|
|||
device_destroy(&ddb_class, MKDEV(ddb_major, dev->nr));
|
||||
ddbs[dev->nr] = NULL;
|
||||
dev->ddb_dev = ERR_PTR(-ENODEV);
|
||||
} else
|
||||
} else {
|
||||
ddb_num++;
|
||||
}
|
||||
fail:
|
||||
mutex_unlock(&ddb_mutex);
|
||||
return res;
|
||||
|
|
|
@ -185,7 +185,7 @@ static const struct ddb_info ddb_ctv7 = {
|
|||
.board_control_2 = 4,
|
||||
};
|
||||
|
||||
static const struct ddb_info ddb_satixS2v3 = {
|
||||
static const struct ddb_info ddb_satixs2v3 = {
|
||||
.type = DDB_OCTOPUS,
|
||||
.name = "Mystique SaTiX-S2 V3 DVB adapter",
|
||||
.regmap = &octopus_map,
|
||||
|
@ -336,7 +336,7 @@ static const struct ddb_device_id ddb_device_ids[] = {
|
|||
DDB_DEVID(0x0006, 0x0022, ddb_v7),
|
||||
DDB_DEVID(0x0006, 0x0024, ddb_v7a),
|
||||
DDB_DEVID(0x0003, 0x0030, ddb_dvbct),
|
||||
DDB_DEVID(0x0003, 0xdb03, ddb_satixS2v3),
|
||||
DDB_DEVID(0x0003, 0xdb03, ddb_satixs2v3),
|
||||
DDB_DEVID(0x0006, 0x0031, ddb_ctv7),
|
||||
DDB_DEVID(0x0006, 0x0032, ddb_ctv7),
|
||||
DDB_DEVID(0x0006, 0x0033, ddb_ctv7),
|
||||
|
@ -367,8 +367,8 @@ const struct ddb_info *get_ddb_info(u16 vendor, u16 device,
|
|||
if (vendor == id->vendor &&
|
||||
device == id->device &&
|
||||
subvendor == id->subvendor &&
|
||||
((subdevice == id->subdevice) ||
|
||||
(id->subdevice == 0xffff)))
|
||||
(subdevice == id->subdevice ||
|
||||
id->subdevice == 0xffff))
|
||||
return id->info;
|
||||
}
|
||||
|
||||
|
|
|
@ -224,7 +224,9 @@ int ddb_i2c_init(struct ddb *dev)
|
|||
adap = &i2c->adap;
|
||||
i2c_del_adapter(adap);
|
||||
}
|
||||
} else
|
||||
} else {
|
||||
dev->i2c_num = num;
|
||||
}
|
||||
|
||||
return stat;
|
||||
}
|
||||
|
|
|
@ -133,10 +133,11 @@ static void ddb_irq_msi(struct ddb *dev, int nr)
|
|||
dev->msi = stat;
|
||||
dev_info(dev->dev, "using %d MSI interrupt(s)\n",
|
||||
dev->msi);
|
||||
} else
|
||||
} else {
|
||||
dev_info(dev->dev, "MSI not available.\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static int ddb_irq_init(struct ddb *dev)
|
||||
|
@ -202,8 +203,8 @@ static int ddb_probe(struct pci_dev *pdev,
|
|||
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))
|
||||
return -ENODEV;
|
||||
|
||||
dev = vzalloc(sizeof(struct ddb));
|
||||
if (dev == NULL)
|
||||
dev = vzalloc(sizeof(*dev));
|
||||
if (!dev)
|
||||
return -ENOMEM;
|
||||
|
||||
mutex_init(&dev->mutex);
|
||||
|
@ -317,7 +318,7 @@ static __init int module_init_ddbridge(void)
|
|||
if (ddb_class_create() < 0)
|
||||
return -1;
|
||||
ddb_wq = create_workqueue("ddbridge");
|
||||
if (ddb_wq == NULL)
|
||||
if (!ddb_wq)
|
||||
goto exit1;
|
||||
stat = pci_register_driver(&ddb_pci_driver);
|
||||
if (stat < 0)
|
||||
|
|
|
@ -291,34 +291,45 @@ static int max_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
|
|||
|
||||
if (nv != ov) {
|
||||
if (nv) {
|
||||
lnb_set_voltage(dev,
|
||||
port->lnr, 0, SEC_VOLTAGE_13);
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
0, SEC_VOLTAGE_13);
|
||||
if (fmode == 1) {
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
0, SEC_VOLTAGE_13);
|
||||
if (old_quattro) {
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
1, SEC_VOLTAGE_18);
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
2, SEC_VOLTAGE_13);
|
||||
} else {
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
1, SEC_VOLTAGE_13);
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
2, SEC_VOLTAGE_18);
|
||||
}
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
3, SEC_VOLTAGE_18);
|
||||
}
|
||||
} else {
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
0, SEC_VOLTAGE_OFF);
|
||||
if (fmode == 1) {
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
1, SEC_VOLTAGE_OFF);
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
2, SEC_VOLTAGE_OFF);
|
||||
lnb_set_voltage(dev, port->lnr,
|
||||
lnb_set_voltage(
|
||||
dev, port->lnr,
|
||||
3, SEC_VOLTAGE_OFF);
|
||||
}
|
||||
}
|
||||
|
@ -331,7 +342,6 @@ static int max_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
|
|||
|
||||
static int max_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)
|
||||
{
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -95,16 +95,16 @@
|
|||
#define DMA_BASE_WRITE (0x100)
|
||||
#define DMA_BASE_READ (0x140)
|
||||
|
||||
#define TS_CONTROL(_io) (_io->regs + 0x00)
|
||||
#define TS_CONTROL2(_io) (_io->regs + 0x04)
|
||||
#define TS_CONTROL(_io) ((_io)->regs + 0x00)
|
||||
#define TS_CONTROL2(_io) ((_io)->regs + 0x04)
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
/* DMA Buffer */
|
||||
|
||||
#define DMA_BUFFER_CONTROL(_dma) (_dma->regs + 0x00)
|
||||
#define DMA_BUFFER_ACK(_dma) (_dma->regs + 0x04)
|
||||
#define DMA_BUFFER_CURRENT(_dma) (_dma->regs + 0x08)
|
||||
#define DMA_BUFFER_SIZE(_dma) (_dma->regs + 0x0c)
|
||||
#define DMA_BUFFER_CONTROL(_dma) ((_dma)->regs + 0x00)
|
||||
#define DMA_BUFFER_ACK(_dma) ((_dma)->regs + 0x04)
|
||||
#define DMA_BUFFER_CURRENT(_dma) ((_dma)->regs + 0x08)
|
||||
#define DMA_BUFFER_SIZE(_dma) ((_dma)->regs + 0x0c)
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
/* CI Interface (only CI-Bridge) */
|
||||
|
@ -148,8 +148,8 @@
|
|||
#define LNB_CMD_OFF 5
|
||||
#define LNB_CMD_DISEQC 6
|
||||
|
||||
#define LNB_BUSY (1ULL << 4)
|
||||
#define LNB_TONE (1ULL << 15)
|
||||
#define LNB_BUSY BIT_ULL(4)
|
||||
#define LNB_TONE BIT_ULL(15)
|
||||
|
||||
#define LNB_BUF_LEVEL(i) (LNB_BASE + (i) * 0x20 + 0x10)
|
||||
#define LNB_BUF_WRITE(i) (LNB_BASE + (i) * 0x20 + 0x14)
|
||||
|
|
|
@ -166,7 +166,7 @@ struct ddb_dma {
|
|||
u32 bufval;
|
||||
|
||||
struct work_struct work;
|
||||
spinlock_t lock;
|
||||
spinlock_t lock; /* DMA lock */
|
||||
wait_queue_head_t wq;
|
||||
int running;
|
||||
u32 stat;
|
||||
|
@ -206,7 +206,6 @@ struct ddb_ci {
|
|||
struct dvb_ca_en50221 en;
|
||||
struct ddb_port *port;
|
||||
u32 nr;
|
||||
struct mutex lock;
|
||||
};
|
||||
|
||||
struct ddb_io {
|
||||
|
@ -240,7 +239,7 @@ struct ddb_port {
|
|||
u32 regs;
|
||||
u32 lnr;
|
||||
struct ddb_i2c *i2c;
|
||||
struct mutex i2c_gate_lock;
|
||||
struct mutex i2c_gate_lock; /* I2C access lock */
|
||||
u32 class;
|
||||
#define DDB_PORT_NONE 0
|
||||
#define DDB_PORT_CI 1
|
||||
|
@ -297,7 +296,7 @@ struct ddb_port {
|
|||
#define TS_CAPTURE_LEN (4096)
|
||||
|
||||
struct ddb_lnb {
|
||||
struct mutex lock;
|
||||
struct mutex lock; /* lock lnb access */
|
||||
u32 tone;
|
||||
enum fe_sec_voltage oldvoltage[4];
|
||||
u32 voltage[4];
|
||||
|
@ -310,13 +309,13 @@ struct ddb_link {
|
|||
const struct ddb_info *info;
|
||||
u32 nr;
|
||||
u32 regs;
|
||||
spinlock_t lock;
|
||||
struct mutex flash_mutex;
|
||||
spinlock_t lock; /* lock link access */
|
||||
struct mutex flash_mutex; /* lock flash access */
|
||||
struct ddb_lnb lnb;
|
||||
struct tasklet_struct tasklet;
|
||||
struct ddb_ids ids;
|
||||
|
||||
spinlock_t temp_lock;
|
||||
spinlock_t temp_lock; /* lock temp chip access */
|
||||
int overtemperature_error;
|
||||
u8 temp_tab[11];
|
||||
};
|
||||
|
@ -355,7 +354,7 @@ struct ddb {
|
|||
u32 ts_irq;
|
||||
u32 i2c_irq;
|
||||
|
||||
struct mutex mutex;
|
||||
struct mutex mutex; /* lock access to global ddb array */
|
||||
|
||||
u8 tsbuf[TS_CAPTURE_LEN];
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue