tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: ttpci: remove unnecessary (void*) conversions
Pointer variables of void * type do not require type cast.
Signed-off-by: Yu Zhe <yuzhe@nfschina.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
authored by
Yu Zhe
and committed by
Hans Verkuil
778f247f
da9b2c59
+45
-45
+17
-17
drivers/media/pci/ttpci/budget-av.c
+17
-17
drivers/media/pci/ttpci/budget-av.c
···
123
123
124
124
static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address)
125
125
{
126
-
struct budget_av *budget_av = (struct budget_av *) ca->data;
126
+
struct budget_av *budget_av = ca->data;
127
127
int result;
128
128
129
129
if (slot != 0)
···
142
142
143
143
static int ciintf_write_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address, u8 value)
144
144
{
145
-
struct budget_av *budget_av = (struct budget_av *) ca->data;
145
+
struct budget_av *budget_av = ca->data;
146
146
int result;
147
147
148
148
if (slot != 0)
···
161
161
162
162
static int ciintf_read_cam_control(struct dvb_ca_en50221 *ca, int slot, u8 address)
163
163
{
164
-
struct budget_av *budget_av = (struct budget_av *) ca->data;
164
+
struct budget_av *budget_av = ca->data;
165
165
int result;
166
166
167
167
if (slot != 0)
···
181
181
182
182
static int ciintf_write_cam_control(struct dvb_ca_en50221 *ca, int slot, u8 address, u8 value)
183
183
{
184
-
struct budget_av *budget_av = (struct budget_av *) ca->data;
184
+
struct budget_av *budget_av = ca->data;
185
185
int result;
186
186
187
187
if (slot != 0)
···
200
200
201
201
static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot)
202
202
{
203
-
struct budget_av *budget_av = (struct budget_av *) ca->data;
203
+
struct budget_av *budget_av = ca->data;
204
204
struct saa7146_dev *saa = budget_av->budget.dev;
205
205
206
206
if (slot != 0)
···
229
229
230
230
static int ciintf_slot_shutdown(struct dvb_ca_en50221 *ca, int slot)
231
231
{
232
-
struct budget_av *budget_av = (struct budget_av *) ca->data;
232
+
struct budget_av *budget_av = ca->data;
233
233
struct saa7146_dev *saa = budget_av->budget.dev;
234
234
235
235
if (slot != 0)
···
245
245
246
246
static int ciintf_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot)
247
247
{
248
-
struct budget_av *budget_av = (struct budget_av *) ca->data;
248
+
struct budget_av *budget_av = ca->data;
249
249
struct saa7146_dev *saa = budget_av->budget.dev;
250
250
251
251
if (slot != 0)
···
260
260
261
261
static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open)
262
262
{
263
-
struct budget_av *budget_av = (struct budget_av *) ca->data;
263
+
struct budget_av *budget_av = ca->data;
264
264
struct saa7146_dev *saa = budget_av->budget.dev;
265
265
int result;
266
266
···
491
491
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
492
492
u32 div;
493
493
u8 buf[4];
494
-
struct budget *budget = (struct budget *) fe->dvb->priv;
494
+
struct budget *budget = fe->dvb->priv;
495
495
struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) };
496
496
497
497
if ((c->frequency < 950000) || (c->frequency > 2150000))
···
604
604
static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe)
605
605
{
606
606
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
607
-
struct budget *budget = (struct budget *) fe->dvb->priv;
607
+
struct budget *budget = fe->dvb->priv;
608
608
u8 buf[6];
609
609
struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };
610
610
int i;
···
668
668
669
669
static int philips_tu1216_tuner_init(struct dvb_frontend *fe)
670
670
{
671
-
struct budget *budget = (struct budget *) fe->dvb->priv;
671
+
struct budget *budget = fe->dvb->priv;
672
672
static u8 tu1216_init[] = { 0x0b, 0xf5, 0x85, 0xab };
673
673
struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tu1216_init,.len = sizeof(tu1216_init) };
674
674
···
685
685
static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe)
686
686
{
687
687
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
688
-
struct budget *budget = (struct budget *) fe->dvb->priv;
688
+
struct budget *budget = fe->dvb->priv;
689
689
u8 tuner_buf[4];
690
690
struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,.len =
691
691
sizeof(tuner_buf) };
···
769
769
static int philips_tu1216_request_firmware(struct dvb_frontend *fe,
770
770
const struct firmware **fw, char *name)
771
771
{
772
-
struct budget *budget = (struct budget *) fe->dvb->priv;
772
+
struct budget *budget = fe->dvb->priv;
773
773
774
774
return request_firmware(fw, name, &budget->dev->pci->dev);
775
775
}
···
1353
1353
1354
1354
static void budget_av_irq(struct saa7146_dev *dev, u32 * isr)
1355
1355
{
1356
-
struct budget_av *budget_av = (struct budget_av *) dev->ext_priv;
1356
+
struct budget_av *budget_av = dev->ext_priv;
1357
1357
1358
1358
dprintk(8, "dev: %p, budget_av: %p\n", dev, budget_av);
1359
1359
···
1363
1363
1364
1364
static int budget_av_detach(struct saa7146_dev *dev)
1365
1365
{
1366
-
struct budget_av *budget_av = (struct budget_av *) dev->ext_priv;
1366
+
struct budget_av *budget_av = dev->ext_priv;
1367
1367
int err;
1368
1368
1369
1369
dprintk(2, "dev: %p\n", dev);
···
1412
1412
static int vidioc_g_input(struct file *file, void *fh, unsigned int *i)
1413
1413
{
1414
1414
struct saa7146_dev *dev = video_drvdata(file);
1415
-
struct budget_av *budget_av = (struct budget_av *)dev->ext_priv;
1415
+
struct budget_av *budget_av = dev->ext_priv;
1416
1416
1417
1417
*i = budget_av->cur_input;
1418
1418
···
1423
1423
static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
1424
1424
{
1425
1425
struct saa7146_dev *dev = video_drvdata(file);
1426
-
struct budget_av *budget_av = (struct budget_av *)dev->ext_priv;
1426
+
struct budget_av *budget_av = dev->ext_priv;
1427
1427
1428
1428
dprintk(1, "VIDIOC_S_INPUT %d\n", input);
1429
1429
return saa7113_setinput(budget_av, input);
+15
-15
drivers/media/pci/ttpci/budget-ci.c
+15
-15
drivers/media/pci/ttpci/budget-ci.c
···
251
251
252
252
static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address)
253
253
{
254
-
struct budget_ci *budget_ci = (struct budget_ci *) ca->data;
254
+
struct budget_ci *budget_ci = ca->data;
255
255
256
256
if (slot != 0)
257
257
return -EINVAL;
···
262
262
263
263
static int ciintf_write_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address, u8 value)
264
264
{
265
-
struct budget_ci *budget_ci = (struct budget_ci *) ca->data;
265
+
struct budget_ci *budget_ci = ca->data;
266
266
267
267
if (slot != 0)
268
268
return -EINVAL;
···
273
273
274
274
static int ciintf_read_cam_control(struct dvb_ca_en50221 *ca, int slot, u8 address)
275
275
{
276
-
struct budget_ci *budget_ci = (struct budget_ci *) ca->data;
276
+
struct budget_ci *budget_ci = ca->data;
277
277
278
278
if (slot != 0)
279
279
return -EINVAL;
···
284
284
285
285
static int ciintf_write_cam_control(struct dvb_ca_en50221 *ca, int slot, u8 address, u8 value)
286
286
{
287
-
struct budget_ci *budget_ci = (struct budget_ci *) ca->data;
287
+
struct budget_ci *budget_ci = ca->data;
288
288
289
289
if (slot != 0)
290
290
return -EINVAL;
···
295
295
296
296
static int ciintf_slot_reset(struct dvb_ca_en50221 *ca, int slot)
297
297
{
298
-
struct budget_ci *budget_ci = (struct budget_ci *) ca->data;
298
+
struct budget_ci *budget_ci = ca->data;
299
299
struct saa7146_dev *saa = budget_ci->budget.dev;
300
300
301
301
if (slot != 0)
···
318
318
319
319
static int ciintf_slot_shutdown(struct dvb_ca_en50221 *ca, int slot)
320
320
{
321
-
struct budget_ci *budget_ci = (struct budget_ci *) ca->data;
321
+
struct budget_ci *budget_ci = ca->data;
322
322
struct saa7146_dev *saa = budget_ci->budget.dev;
323
323
324
324
if (slot != 0)
···
331
331
332
332
static int ciintf_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot)
333
333
{
334
-
struct budget_ci *budget_ci = (struct budget_ci *) ca->data;
334
+
struct budget_ci *budget_ci = ca->data;
335
335
struct saa7146_dev *saa = budget_ci->budget.dev;
336
336
int tmp;
337
337
···
400
400
401
401
static int ciintf_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open)
402
402
{
403
-
struct budget_ci *budget_ci = (struct budget_ci *) ca->data;
403
+
struct budget_ci *budget_ci = ca->data;
404
404
unsigned int flags;
405
405
406
406
// ensure we don't get spurious IRQs during initialisation
···
553
553
554
554
static void budget_ci_irq(struct saa7146_dev *dev, u32 * isr)
555
555
{
556
-
struct budget_ci *budget_ci = (struct budget_ci *) dev->ext_priv;
556
+
struct budget_ci *budget_ci = dev->ext_priv;
557
557
558
558
dprintk(8, "dev: %p, budget_ci: %p\n", dev, budget_ci);
559
559
···
648
648
static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe)
649
649
{
650
650
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
651
-
struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
651
+
struct budget_ci *budget_ci = fe->dvb->priv;
652
652
u32 div;
653
653
u8 buf[4];
654
654
struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof(buf) };
···
698
698
699
699
static int philips_tdm1316l_tuner_init(struct dvb_frontend *fe)
700
700
{
701
-
struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
701
+
struct budget_ci *budget_ci = fe->dvb->priv;
702
702
static u8 td1316_init[] = { 0x0b, 0xf5, 0x85, 0xab };
703
703
static u8 disable_mc44BC374c[] = { 0x1d, 0x74, 0xa0, 0x68 };
704
704
struct i2c_msg tuner_msg = {.addr = budget_ci->tuner_pll_address,.flags = 0,.buf = td1316_init,.len =
···
729
729
static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)
730
730
{
731
731
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
732
-
struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
732
+
struct budget_ci *budget_ci = fe->dvb->priv;
733
733
u8 tuner_buf[4];
734
734
struct i2c_msg tuner_msg = {.addr = budget_ci->tuner_pll_address,.flags = 0,.buf = tuner_buf,.len = sizeof(tuner_buf) };
735
735
int tuner_frequency = 0;
···
815
815
static int philips_tdm1316l_request_firmware(struct dvb_frontend *fe,
816
816
const struct firmware **fw, char *name)
817
817
{
818
-
struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
818
+
struct budget_ci *budget_ci = fe->dvb->priv;
819
819
820
820
return request_firmware(fw, name, &budget_ci->budget.dev->pci->dev);
821
821
}
···
845
845
static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe)
846
846
{
847
847
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
848
-
struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv;
848
+
struct budget_ci *budget_ci = fe->dvb->priv;
849
849
u8 tuner_buf[5];
850
850
struct i2c_msg tuner_msg = {.addr = budget_ci->tuner_pll_address,
851
851
.flags = 0,
···
1494
1494
1495
1495
static int budget_ci_detach(struct saa7146_dev *dev)
1496
1496
{
1497
-
struct budget_ci *budget_ci = (struct budget_ci *) dev->ext_priv;
1497
+
struct budget_ci *budget_ci = dev->ext_priv;
1498
1498
struct saa7146_dev *saa = budget_ci->budget.dev;
1499
1499
int err;
1500
1500
+3
-3
drivers/media/pci/ttpci/budget-core.c
+3
-3
drivers/media/pci/ttpci/budget-core.c
···
147
147
static int budget_read_fe_status(struct dvb_frontend *fe,
148
148
enum fe_status *status)
149
149
{
150
-
struct budget *budget = (struct budget *) fe->dvb->priv;
150
+
struct budget *budget = fe->dvb->priv;
151
151
int synced;
152
152
int ret;
153
153
···
570
570
571
571
void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr)
572
572
{
573
-
struct budget *budget = (struct budget *) dev->ext_priv;
573
+
struct budget *budget = dev->ext_priv;
574
574
575
575
dprintk(8, "dev: %p, budget: %p\n", dev, budget);
576
576
···
580
580
581
581
void ttpci_budget_set_video_port(struct saa7146_dev *dev, int video_port)
582
582
{
583
-
struct budget *budget = (struct budget *) dev->ext_priv;
583
+
struct budget *budget = dev->ext_priv;
584
584
585
585
spin_lock(&budget->feedlock);
586
586
budget->video_port = video_port;
+10
-10
drivers/media/pci/ttpci/budget.c
+10
-10
drivers/media/pci/ttpci/budget.c
···
144
144
static int siemens_budget_set_voltage(struct dvb_frontend *fe,
145
145
enum fe_sec_voltage voltage)
146
146
{
147
-
struct budget* budget = (struct budget*) fe->dvb->priv;
147
+
struct budget *budget = fe->dvb->priv;
148
148
149
149
return SetVoltage_Activy (budget, voltage);
150
150
}
···
152
152
static int budget_set_tone(struct dvb_frontend *fe,
153
153
enum fe_sec_tone_mode tone)
154
154
{
155
-
struct budget* budget = (struct budget*) fe->dvb->priv;
155
+
struct budget *budget = fe->dvb->priv;
156
156
157
157
switch (tone) {
158
158
case SEC_TONE_ON:
···
172
172
173
173
static int budget_diseqc_send_master_cmd(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd)
174
174
{
175
-
struct budget* budget = (struct budget*) fe->dvb->priv;
175
+
struct budget *budget = fe->dvb->priv;
176
176
177
177
SendDiSEqCMsg (budget, cmd->msg_len, cmd->msg, 0);
178
178
···
182
182
static int budget_diseqc_send_burst(struct dvb_frontend *fe,
183
183
enum fe_sec_mini_cmd minicmd)
184
184
{
185
-
struct budget* budget = (struct budget*) fe->dvb->priv;
185
+
struct budget *budget = fe->dvb->priv;
186
186
187
187
SendDiSEqCMsg (budget, 0, NULL, minicmd);
188
188
···
192
192
static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe)
193
193
{
194
194
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
195
-
struct budget* budget = (struct budget*) fe->dvb->priv;
195
+
struct budget *budget = fe->dvb->priv;
196
196
u8 pwr = 0;
197
197
u8 buf[4];
198
198
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
···
234
234
static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe)
235
235
{
236
236
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
237
-
struct budget* budget = (struct budget*) fe->dvb->priv;
237
+
struct budget *budget = fe->dvb->priv;
238
238
u32 div;
239
239
u8 data[4];
240
240
struct i2c_msg msg = { .addr = 0x62, .flags = 0, .buf = data, .len = sizeof(data) };
···
320
320
static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe)
321
321
{
322
322
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
323
-
struct budget* budget = (struct budget*) fe->dvb->priv;
323
+
struct budget *budget = fe->dvb->priv;
324
324
u32 div;
325
325
u8 data[4];
326
326
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
···
344
344
static int s5h1420_tuner_set_params(struct dvb_frontend *fe)
345
345
{
346
346
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
347
-
struct budget* budget = (struct budget*) fe->dvb->priv;
347
+
struct budget *budget = fe->dvb->priv;
348
348
u32 div;
349
349
u8 data[4];
350
350
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
···
405
405
406
406
static int alps_tdhd1_204_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name)
407
407
{
408
-
struct budget *budget = (struct budget *)fe->dvb->priv;
408
+
struct budget *budget = fe->dvb->priv;
409
409
410
410
return request_firmware(fw, name, &budget->dev->pci->dev);
411
411
}
···
800
800
801
801
static int budget_detach (struct saa7146_dev* dev)
802
802
{
803
-
struct budget *budget = (struct budget*) dev->ext_priv;
803
+
struct budget *budget = dev->ext_priv;
804
804
int err;
805
805
806
806
if (budget->dvb_frontend) {