media: usb: remove unnecessary (void*) conversions

No need cast (void*) to (struct dvb_usb_device *) or
(struct filter_info *).

Signed-off-by: Su Hui <suhui@nfschina.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil: drop the obsolete dvb-usb/az6027.c and dvb-usb/pctv452e.c changes]

diff --git a/drivers/media/usb/dvb-usb-v2/az6007.c b/drivers/media/usb/dvb-usb-v2/az6007.c
index 7524c90f5da61d4fe01b638cfd77047f4f0bb476..2dcbb49d66dab2eabcc7d595df76d3532d438163 100644 (file)
--- a/drivers/media/usb/dvb-usb-v2/az6007.c
+++ b/drivers/media/usb/dvb-usb-v2/az6007.c
@@ -249,7 +249,7 @@ static int az6007_ci_read_attribute_mem(struct dvb_ca_en50221 *ca,
                                        int slot,
                                        int address)
 {
-       struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
+       struct dvb_usb_device *d = ca->data;
        struct az6007_device_state *state = d_to_priv(d);
 
        int ret;
@@ -291,7 +291,7 @@ static int az6007_ci_write_attribute_mem(struct dvb_ca_en50221 *ca,
                                         int address,
                                         u8 value)
 {
-       struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
+       struct dvb_usb_device *d = ca->data;
        struct az6007_device_state *state = d_to_priv(d);
 
        int ret;
@@ -322,7 +322,7 @@ static int az6007_ci_read_cam_control(struct dvb_ca_en50221 *ca,
                                      int slot,
                                      u8 address)
 {
-       struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
+       struct dvb_usb_device *d = ca->data;
        struct az6007_device_state *state = d_to_priv(d);
 
        int ret;
@@ -368,7 +368,7 @@ static int az6007_ci_write_cam_control(struct dvb_ca_en50221 *ca,
                                       u8 address,
                                       u8 value)
 {
-       struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
+       struct dvb_usb_device *d = ca->data;
        struct az6007_device_state *state = d_to_priv(d);
 
        int ret;
@@ -399,7 +399,7 @@ failed:
 
 static int CI_CamReady(struct dvb_ca_en50221 *ca, int slot)
 {
-       struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
+       struct dvb_usb_device *d = ca->data;
 
        int ret;
        u8 req;
@@ -430,7 +430,7 @@ static int CI_CamReady(struct dvb_ca_en50221 *ca, int slot)
 
 static int az6007_ci_slot_reset(struct dvb_ca_en50221 *ca, int slot)
 {
-       struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
+       struct dvb_usb_device *d = ca->data;
        struct az6007_device_state *state = d_to_priv(d);
 
        int ret, i;
@@ -486,7 +486,7 @@ static int az6007_ci_slot_shutdown(struct dvb_ca_en50221 *ca, int slot)
 
 static int az6007_ci_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot)
 {
-       struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
+       struct dvb_usb_device *d = ca->data;
        struct az6007_device_state *state = d_to_priv(d);
 
        int ret;
@@ -515,7 +515,7 @@ failed:
 
 static int az6007_ci_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int open)
 {
-       struct dvb_usb_device *d = (struct dvb_usb_device *)ca->data;
+       struct dvb_usb_device *d = ca->data;
        struct az6007_device_state *state = d_to_priv(d);
        int ret;
        u8 req;

diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
index c4474d4c44e28adc84a26265ac45dd619bef3df2..79faa256061333bb01456b7833fd1f37719dee6b 100644 (file)
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
@@ -1128,7 +1128,7 @@ static int ttusb_dec_stop_sec_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
        struct ttusb_dec *dec = dvbdmxfeed->demux->priv;
        u8 b0[] = { 0x00, 0x00 };
-       struct filter_info *finfo = (struct filter_info *)dvbdmxfeed->priv;
+       struct filter_info *finfo = dvbdmxfeed->priv;
        unsigned long flags;
 
        b0[1] = finfo->stream_id;