Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: dvb-usb: remove unnecessary (void*) conversions
Pointer variables of void * type do not require type cast.
Link: https://lore.kernel.org/linux-media/20230320064039.5670-1-yuzhe@nfschina.com
Signed-off-by: Yu Zhe <yuzhe@nfschina.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
authored by
Yu Zhe
and committed by
Mauro Carvalho Chehab
663e7460
a41ef786
+38
-44
+1
-2
drivers/media/usb/dvb-usb/af9005-fe.c
+1
-2
drivers/media/usb/dvb-usb/af9005-fe.c
+17
-17
drivers/media/usb/dvb-usb/az6027.c
+17
-17
drivers/media/usb/dvb-usb/az6027.c
···
407
407
int slot,
408
408
int address)
409
409
{
410
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
411
-
struct az6027_device_state *state = (struct az6027_device_state *)d->priv;
410
+
struct dvb_usb_device *d = ca->data;
411
+
struct az6027_device_state *state = d->priv;
412
412
413
413
int ret;
414
414
u8 req;
···
449
449
int address,
450
450
u8 value)
451
451
{
452
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
453
-
struct az6027_device_state *state = (struct az6027_device_state *)d->priv;
452
+
struct dvb_usb_device *d = ca->data;
453
+
struct az6027_device_state *state = d->priv;
454
454
455
455
int ret;
456
456
u8 req;
···
480
480
int slot,
481
481
u8 address)
482
482
{
483
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
484
-
struct az6027_device_state *state = (struct az6027_device_state *)d->priv;
483
+
struct dvb_usb_device *d = ca->data;
484
+
struct az6027_device_state *state = d->priv;
485
485
486
486
int ret;
487
487
u8 req;
···
526
526
u8 address,
527
527
u8 value)
528
528
{
529
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
530
-
struct az6027_device_state *state = (struct az6027_device_state *)d->priv;
529
+
struct dvb_usb_device *d = ca->data;
530
+
struct az6027_device_state *state = d->priv;
531
531
532
532
int ret;
533
533
u8 req;
···
557
557
558
558
static int CI_CamReady(struct dvb_ca_en50221 *ca, int slot)
559
559
{
560
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
560
+
struct dvb_usb_device *d = ca->data;
561
561
562
562
int ret;
563
563
u8 req;
···
588
588
589
589
static int az6027_ci_slot_reset(struct dvb_ca_en50221 *ca, int slot)
590
590
{
591
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
592
-
struct az6027_device_state *state = (struct az6027_device_state *)d->priv;
591
+
struct dvb_usb_device *d = ca->data;
592
+
struct az6027_device_state *state = d->priv;
593
593
594
594
int ret, i;
595
595
u8 req;
···
644
644
645
645
static int az6027_ci_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot)
646
646
{
647
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
648
-
struct az6027_device_state *state = (struct az6027_device_state *)d->priv;
647
+
struct dvb_usb_device *d = ca->data;
648
+
struct az6027_device_state *state = d->priv;
649
649
650
650
int ret;
651
651
u8 req;
···
673
673
674
674
static int az6027_ci_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open)
675
675
{
676
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
677
-
struct az6027_device_state *state = (struct az6027_device_state *)d->priv;
676
+
struct dvb_usb_device *d = ca->data;
677
+
struct az6027_device_state *state = d->priv;
678
678
int ret;
679
679
u8 req;
680
680
u16 value;
···
719
719
if (NULL == d)
720
720
return;
721
721
722
-
state = (struct az6027_device_state *)d->priv;
722
+
state = d->priv;
723
723
if (NULL == state)
724
724
return;
725
725
···
735
735
static int az6027_ci_init(struct dvb_usb_adapter *a)
736
736
{
737
737
struct dvb_usb_device *d = a->dev;
738
-
struct az6027_device_state *state = (struct az6027_device_state *)d->priv;
738
+
struct az6027_device_state *state = d->priv;
739
739
int ret;
740
740
741
741
deb_info("%s", __func__);
+1
-1
drivers/media/usb/dvb-usb/dtt200u-fe.c
+1
-1
drivers/media/usb/dvb-usb/dtt200u-fe.c
+8
-12
drivers/media/usb/dvb-usb/dw2102.c
+8
-12
drivers/media/usb/dvb-usb/dw2102.c
···
903
903
904
904
static int su3000_power_ctrl(struct dvb_usb_device *d, int i)
905
905
{
906
-
struct dw2102_state *state = (struct dw2102_state *)d->priv;
906
+
struct dw2102_state *state = d->priv;
907
907
int ret = 0;
908
908
909
909
info("%s: %d, initialized %d", __func__, i, state->initialized);
···
978
978
.len = 2,
979
979
};
980
980
981
-
struct dvb_usb_adapter *udev_adap =
982
-
(struct dvb_usb_adapter *)(fe->dvb->priv);
981
+
struct dvb_usb_adapter *udev_adap = fe->dvb->priv;
983
982
if (voltage == SEC_VOLTAGE_18)
984
983
msg.buf = command_18v;
985
984
else if (voltage == SEC_VOLTAGE_13)
···
992
993
static int s660_set_voltage(struct dvb_frontend *fe,
993
994
enum fe_sec_voltage voltage)
994
995
{
995
-
struct dvb_usb_adapter *d =
996
-
(struct dvb_usb_adapter *)(fe->dvb->priv);
997
-
struct dw2102_state *st = (struct dw2102_state *)d->dev->priv;
996
+
struct dvb_usb_adapter *d = fe->dvb->priv;
997
+
struct dw2102_state *st = d->dev->priv;
998
998
999
999
dw210x_set_voltage(fe, voltage);
1000
1000
if (st->old_set_voltage)
···
1012
1014
.buf = led_off,
1013
1015
.len = 1
1014
1016
};
1015
-
struct dvb_usb_adapter *udev_adap =
1016
-
(struct dvb_usb_adapter *)(fe->dvb->priv);
1017
+
struct dvb_usb_adapter *udev_adap = fe->dvb->priv;
1017
1018
1018
1019
if (offon)
1019
1020
msg.buf = led_on;
···
1022
1025
static int tt_s2_4600_read_status(struct dvb_frontend *fe,
1023
1026
enum fe_status *status)
1024
1027
{
1025
-
struct dvb_usb_adapter *d =
1026
-
(struct dvb_usb_adapter *)(fe->dvb->priv);
1027
-
struct dw2102_state *st = (struct dw2102_state *)d->dev->priv;
1028
+
struct dvb_usb_adapter *d = fe->dvb->priv;
1029
+
struct dw2102_state *st = d->dev->priv;
1028
1030
int ret;
1029
1031
1030
1032
ret = st->fe_read_status(fe, status);
···
2572
2576
static void dw2102_disconnect(struct usb_interface *intf)
2573
2577
{
2574
2578
struct dvb_usb_device *d = usb_get_intfdata(intf);
2575
-
struct dw2102_state *st = (struct dw2102_state *)d->priv;
2579
+
struct dw2102_state *st = d->priv;
2576
2580
struct i2c_client *client;
2577
2581
2578
2582
/* remove I2C client for tuner */
+1
-2
drivers/media/usb/dvb-usb/opera1.c
+1
-2
drivers/media/usb/dvb-usb/opera1.c
···
172
172
struct i2c_msg msg[] = {
173
173
{.addr = ADDR_B600_VOLTAGE_13V,.flags = 0,.buf = command_13v,.len = 1},
174
174
};
175
-
struct dvb_usb_adapter *udev_adap =
176
-
(struct dvb_usb_adapter *)(fe->dvb->priv);
175
+
struct dvb_usb_adapter *udev_adap = fe->dvb->priv;
177
176
if (voltage == SEC_VOLTAGE_18) {
178
177
msg[0].addr = ADDR_B601_VOLTAGE_18V;
179
178
msg[0].buf = command_18v;
+10
-10
drivers/media/usb/dvb-usb/pctv452e.c
+10
-10
drivers/media/usb/dvb-usb/pctv452e.c
···
108
108
static int tt3650_ci_msg(struct dvb_usb_device *d, u8 cmd, u8 *data,
109
109
unsigned int write_len, unsigned int read_len)
110
110
{
111
-
struct pctv452e_state *state = (struct pctv452e_state *)d->priv;
111
+
struct pctv452e_state *state = d->priv;
112
112
u8 *buf;
113
113
u8 id;
114
114
unsigned int rlen;
···
159
159
u8 cmd, u8 *data, unsigned int write_len,
160
160
unsigned int read_len)
161
161
{
162
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
163
-
struct pctv452e_state *state = (struct pctv452e_state *)d->priv;
162
+
struct dvb_usb_device *d = ca->data;
163
+
struct pctv452e_state *state = d->priv;
164
164
int ret;
165
165
166
166
mutex_lock(&state->ca_mutex);
···
292
292
293
293
static int tt3650_ci_slot_reset(struct dvb_ca_en50221 *ca, int slot)
294
294
{
295
-
struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
296
-
struct pctv452e_state *state = (struct pctv452e_state *)d->priv;
295
+
struct dvb_usb_device *d = ca->data;
296
+
struct pctv452e_state *state = d->priv;
297
297
u8 buf[1];
298
298
int ret;
299
299
···
361
361
if (NULL == d)
362
362
return;
363
363
364
-
state = (struct pctv452e_state *)d->priv;
364
+
state = d->priv;
365
365
if (NULL == state)
366
366
return;
367
367
···
379
379
static int tt3650_ci_init(struct dvb_usb_adapter *a)
380
380
{
381
381
struct dvb_usb_device *d = a->dev;
382
-
struct pctv452e_state *state = (struct pctv452e_state *)d->priv;
382
+
struct pctv452e_state *state = d->priv;
383
383
int ret;
384
384
385
385
ci_dbg("%s", __func__);
···
417
417
const u8 *snd_buf, u8 snd_len,
418
418
u8 *rcv_buf, u8 rcv_len)
419
419
{
420
-
struct pctv452e_state *state = (struct pctv452e_state *)d->priv;
420
+
struct pctv452e_state *state = d->priv;
421
421
u8 *buf;
422
422
u8 id;
423
423
int ret;
···
516
516
517
517
static int pctv452e_power_ctrl(struct dvb_usb_device *d, int i)
518
518
{
519
-
struct pctv452e_state *state = (struct pctv452e_state *)d->priv;
519
+
struct pctv452e_state *state = d->priv;
520
520
u8 *b0, *rx;
521
521
int ret;
522
522
···
567
567
568
568
static int pctv452e_rc_query(struct dvb_usb_device *d)
569
569
{
570
-
struct pctv452e_state *state = (struct pctv452e_state *)d->priv;
570
+
struct pctv452e_state *state = d->priv;
571
571
u8 *b, *rx;
572
572
int ret, i;
573
573
u8 id;