You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[media] drivers/media: Remove unnecessary semicolon
A simplified version of the semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r1@ statement S; position p,p1; @@ S@p1;@p @script:python r2@ p << r1.p; p1 << r1.p1; @@ if p[0].line != p1[0].line_end: cocci.include_match(False) @@ position r1.p; @@ -;@p // </smpl> [mchehab@redhat.com: some hunks got bitroted; applied only the ones that succeeds] Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> [crope@iki.fi: For my drivers a8293, af9013, af9015, af9035] Acked-by: Antti Palosaari <crope@iki.fi> Reviewed-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
committed by
Mauro Carvalho Chehab
parent
54fd321e13
commit
c2c1b4156a
@@ -2309,7 +2309,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
|
||||
fepriv->tune_mode_flags = (unsigned long) parg;
|
||||
err = 0;
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ static int a8293_set_voltage(struct dvb_frontend *fe,
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
};
|
||||
}
|
||||
|
||||
ret = a8293_wr(priv, &priv->reg[0], 1);
|
||||
if (ret)
|
||||
|
||||
@@ -241,7 +241,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)
|
||||
KBUILD_MODNAME, gpio);
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
};
|
||||
}
|
||||
|
||||
switch (gpio) {
|
||||
case 0:
|
||||
@@ -253,7 +253,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)
|
||||
default:
|
||||
pos = 4;
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
||||
ret = af9013_wr_reg_bits(state, addr, pos, 4, gpioval);
|
||||
if (ret)
|
||||
@@ -726,7 +726,7 @@ static int af9013_set_frontend(struct dvb_frontend *fe)
|
||||
default:
|
||||
dev_dbg(&state->i2c->dev, "%s: invalid hierarchy\n", __func__);
|
||||
auto_mode = 1;
|
||||
};
|
||||
}
|
||||
|
||||
switch (c->modulation) {
|
||||
case QAM_AUTO:
|
||||
|
||||
@@ -527,7 +527,7 @@ static int bcm3510_set_frontend(struct dvb_frontend *fe)
|
||||
cmd.ACQUIRE1.IF_FREQ = 0x0;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
cmd.ACQUIRE0.OFFSET = 0;
|
||||
cmd.ACQUIRE0.NTSCSWEEP = 1;
|
||||
cmd.ACQUIRE0.FA = 1;
|
||||
|
||||
@@ -218,7 +218,7 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
|
||||
} else
|
||||
return -EOPNOTSUPP;
|
||||
/* fixme (low): which is the correct return code? */
|
||||
};
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -275,7 +275,7 @@ static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate)
|
||||
cx24110_writereg(state,0x07,tmp|0x3);
|
||||
cx24110_writereg(state,0x06,0x78);
|
||||
fclk=90999000UL;
|
||||
};
|
||||
}
|
||||
dprintk("cx24110 debug: fclk %d Hz\n",fclk);
|
||||
/* we need to divide two integers with approx. 27 bits in 32 bit
|
||||
arithmetic giving a 25 bit result */
|
||||
@@ -362,7 +362,7 @@ static int cx24110_initfe(struct dvb_frontend* fe)
|
||||
|
||||
for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) {
|
||||
cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);
|
||||
};
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -991,7 +991,7 @@ static int HI_Command(struct drxd_state *state, u16 cmd, u16 * pResult)
|
||||
if (nrRetries > DRXD_MAX_RETRIES) {
|
||||
status = -1;
|
||||
break;
|
||||
};
|
||||
}
|
||||
status = Read16(state, HI_RA_RAM_SRV_CMD__A, &waitCmd, 0);
|
||||
} while (waitCmd != 0);
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ static int isl6405_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
}
|
||||
isl6405->config |= isl6405->override_or;
|
||||
isl6405->config &= isl6405->override_and;
|
||||
|
||||
@@ -63,7 +63,7 @@ static int isl6421_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
isl6421->config |= isl6421->override_or;
|
||||
isl6421->config &= isl6421->override_and;
|
||||
|
||||
@@ -65,7 +65,7 @@ static int lnbp21_set_voltage(struct dvb_frontend *fe,
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
lnbp21->config |= lnbp21->override_or;
|
||||
lnbp21->config &= lnbp21->override_and;
|
||||
@@ -108,7 +108,7 @@ static int lnbp21_set_tone(struct dvb_frontend *fe,
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
lnbp21->config |= lnbp21->override_or;
|
||||
lnbp21->config &= lnbp21->override_and;
|
||||
|
||||
@@ -73,7 +73,7 @@ static int lnbp22_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
dprintk(1, "%s: 0x%02x)\n", __func__, lnbp22->config[3]);
|
||||
return (i2c_transfer(lnbp22->i2c, &msg, 1) == 1) ? 0 : -EIO;
|
||||
|
||||
@@ -343,7 +343,7 @@ static int si21xx_wait_diseqc_idle(struct si21xx_state *state, int timeout)
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
msleep(10);
|
||||
};
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -472,7 +472,7 @@ static int si21xx_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
static int si21xx_init(struct dvb_frontend *fe)
|
||||
|
||||
@@ -229,7 +229,7 @@ static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
switch (p->hierarchy) {
|
||||
case HIERARCHY_NONE:
|
||||
@@ -248,7 +248,7 @@ static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
switch (p->code_rate_HP) {
|
||||
case FEC_1_2:
|
||||
@@ -270,7 +270,7 @@ static int configure_reg0xc05(struct dtv_frontend_properties *p, u16 *reg0xc05)
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
if (known_parameters)
|
||||
*reg0xc05 |= (2 << 1); /* use specified parameters */
|
||||
|
||||
@@ -199,7 +199,7 @@ static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout)
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
msleep(10);
|
||||
};
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -216,7 +216,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
msleep(10);
|
||||
};
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -387,7 +387,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
if (state->config->op0_off)
|
||||
reg0x0c &= ~0x10;
|
||||
|
||||
@@ -1552,8 +1552,8 @@ static int stv0900_status(struct stv0900_internal *intp,
|
||||
bitrate = (stv0900_get_mclk_freq(intp, intp->quartz)/1000000)
|
||||
* (tsbitrate1_val << 8 | tsbitrate0_val);
|
||||
bitrate /= 16384;
|
||||
dprintk("TS bitrate = %d Mbit/sec \n", bitrate);
|
||||
};
|
||||
dprintk("TS bitrate = %d Mbit/sec\n", bitrate);
|
||||
}
|
||||
|
||||
return locked;
|
||||
}
|
||||
|
||||
@@ -175,7 +175,7 @@ static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout)
|
||||
!(tda8083_readreg(state, 0x02) & 0x80))
|
||||
{
|
||||
msleep(50);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
static int tda8083_set_tone (struct tda8083_state* state, fe_sec_tone_mode_t tone)
|
||||
@@ -215,7 +215,7 @@ static int tda8083_send_diseqc_burst (struct tda8083_state* state, fe_sec_mini_c
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
tda8083_wait_diseqc_fifo (state, 100);
|
||||
|
||||
|
||||
@@ -599,7 +599,7 @@ static void cx23885_initialize(struct i2c_client *client)
|
||||
cx25840_write4(client, 0x114, 0x01bf0c9e);
|
||||
cx25840_write4(client, 0x110, 0x000a030c);
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
||||
/* ADC2 input select */
|
||||
cx25840_write(client, 0x102, 0x10);
|
||||
|
||||
@@ -646,7 +646,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
|
||||
dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_PID Success !");
|
||||
default:
|
||||
result = -EOPNOTSUPP;
|
||||
};
|
||||
}
|
||||
free_mem_and_exit:
|
||||
kfree (p_ca_message);
|
||||
kfree (p_ca_slot_info);
|
||||
|
||||
@@ -416,7 +416,7 @@ static void netup_read_ci_status(struct work_struct *work)
|
||||
DVB_CA_EN50221_POLL_CAM_READY : 0);
|
||||
ci_dbg_print("%s: setting CI[1] status = 0x%x\n",
|
||||
__func__, inter->state[1]->status);
|
||||
};
|
||||
}
|
||||
|
||||
if (inter->state[0] != NULL) {
|
||||
inter->state[0]->status =
|
||||
@@ -425,7 +425,7 @@ static void netup_read_ci_status(struct work_struct *work)
|
||||
DVB_CA_EN50221_POLL_CAM_READY : 0);
|
||||
ci_dbg_print("%s: setting CI[0] status = 0x%x\n",
|
||||
__func__, inter->state[0]->status);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/* CI irq handler */
|
||||
|
||||
@@ -193,7 +193,7 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
|
||||
0, &store, 1);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
};
|
||||
}
|
||||
state->current_ci_flag = flag;
|
||||
|
||||
mutex_lock(&dev->gpio_lock);
|
||||
|
||||
@@ -896,7 +896,7 @@ static int samsung_smt_7020_set_voltage(struct dvb_frontend *fe,
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
return (i2c_transfer(&dev->core->i2c_adap, &msg, 1) == 1) ? 0 : -EIO;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user