From nobody Mon Feb 9 01:31:02 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BF30C7619A for ; Mon, 20 Mar 2023 06:41:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229837AbjCTGlh (ORCPT ); Mon, 20 Mar 2023 02:41:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229592AbjCTGld (ORCPT ); Mon, 20 Mar 2023 02:41:33 -0400 Received: from mail.nfschina.com (unknown [42.101.60.237]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B40BEC56; Sun, 19 Mar 2023 23:41:30 -0700 (PDT) Received: from localhost (unknown [127.0.0.1]) by mail.nfschina.com (Postfix) with ESMTP id 1D8A41A00A79; Mon, 20 Mar 2023 14:41:31 +0800 (CST) X-Virus-Scanned: amavisd-new at nfschina.com Received: from mail.nfschina.com ([127.0.0.1]) by localhost (localhost.localdomain [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hwkE0LwDQW1n; Mon, 20 Mar 2023 14:41:30 +0800 (CST) Received: from localhost.localdomain (unknown [180.167.10.98]) (Authenticated sender: yuzhe@nfschina.com) by mail.nfschina.com (Postfix) with ESMTPA id A56951A00940; Mon, 20 Mar 2023 14:41:29 +0800 (CST) From: Yu Zhe To: mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, liqiong@nfschina.com, Yu Zhe Subject: [PATCH] media: dvb: remove unnecessary (void*) conversions Date: Mon, 20 Mar 2023 14:40:39 +0800 Message-Id: <20230320064039.5670-1-yuzhe@nfschina.com> X-Mailer: git-send-email 2.11.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Pointer variables of void * type do not require type cast. Signed-off-by: Yu Zhe --- drivers/media/usb/dvb-usb/af9005-fe.c | 3 +-- drivers/media/usb/dvb-usb/az6027.c | 34 +++++++++++++++++-------------= ---- drivers/media/usb/dvb-usb/dtt200u-fe.c | 2 +- drivers/media/usb/dvb-usb/dw2102.c | 20 ++++++++------------ drivers/media/usb/dvb-usb/opera1.c | 3 +-- drivers/media/usb/dvb-usb/pctv452e.c | 20 ++++++++++---------- 6 files changed, 38 insertions(+), 44 deletions(-) diff --git a/drivers/media/usb/dvb-usb/af9005-fe.c b/drivers/media/usb/dvb-= usb/af9005-fe.c index 9d6fa0556d7b..404e56b32145 100644 --- a/drivers/media/usb/dvb-usb/af9005-fe.c +++ b/drivers/media/usb/dvb-usb/af9005-fe.c @@ -1412,8 +1412,7 @@ static int af9005_fe_get_frontend(struct dvb_frontend= *fe, =20 static void af9005_fe_release(struct dvb_frontend *fe) { - struct af9005_fe_state *state =3D - (struct af9005_fe_state *)fe->demodulator_priv; + struct af9005_fe_state *state =3D fe->demodulator_priv; kfree(state); } =20 diff --git a/drivers/media/usb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb= /az6027.c index 7d78ee09be5e..9d0847190748 100644 --- a/drivers/media/usb/dvb-usb/az6027.c +++ b/drivers/media/usb/dvb-usb/az6027.c @@ -407,8 +407,8 @@ static int az6027_ci_read_attribute_mem(struct dvb_ca_e= n50221 *ca, int slot, int address) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; - struct az6027_device_state *state =3D (struct az6027_device_state *)d->pr= iv; + struct dvb_usb_device *d =3D ca->data; + struct az6027_device_state *state =3D d->priv; =20 int ret; u8 req; @@ -449,8 +449,8 @@ static int az6027_ci_write_attribute_mem(struct dvb_ca_= en50221 *ca, int address, u8 value) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; - struct az6027_device_state *state =3D (struct az6027_device_state *)d->pr= iv; + struct dvb_usb_device *d =3D ca->data; + struct az6027_device_state *state =3D d->priv; =20 int ret; u8 req; @@ -480,8 +480,8 @@ static int az6027_ci_read_cam_control(struct dvb_ca_en5= 0221 *ca, int slot, u8 address) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; - struct az6027_device_state *state =3D (struct az6027_device_state *)d->pr= iv; + struct dvb_usb_device *d =3D ca->data; + struct az6027_device_state *state =3D d->priv; =20 int ret; u8 req; @@ -526,8 +526,8 @@ static int az6027_ci_write_cam_control(struct dvb_ca_en= 50221 *ca, u8 address, u8 value) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; - struct az6027_device_state *state =3D (struct az6027_device_state *)d->pr= iv; + struct dvb_usb_device *d =3D ca->data; + struct az6027_device_state *state =3D d->priv; =20 int ret; u8 req; @@ -557,7 +557,7 @@ static int az6027_ci_write_cam_control(struct dvb_ca_en= 50221 *ca, =20 static int CI_CamReady(struct dvb_ca_en50221 *ca, int slot) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; + struct dvb_usb_device *d =3D ca->data; =20 int ret; u8 req; @@ -588,8 +588,8 @@ static int CI_CamReady(struct dvb_ca_en50221 *ca, int s= lot) =20 static int az6027_ci_slot_reset(struct dvb_ca_en50221 *ca, int slot) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; - struct az6027_device_state *state =3D (struct az6027_device_state *)d->pr= iv; + struct dvb_usb_device *d =3D ca->data; + struct az6027_device_state *state =3D d->priv; =20 int ret, i; u8 req; @@ -644,8 +644,8 @@ static int az6027_ci_slot_shutdown(struct dvb_ca_en5022= 1 *ca, int slot) =20 static int az6027_ci_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; - struct az6027_device_state *state =3D (struct az6027_device_state *)d->pr= iv; + struct dvb_usb_device *d =3D ca->data; + struct az6027_device_state *state =3D d->priv; =20 int ret; u8 req; @@ -673,8 +673,8 @@ static int az6027_ci_slot_ts_enable(struct dvb_ca_en502= 21 *ca, int slot) =20 static int az6027_ci_poll_slot_status(struct dvb_ca_en50221 *ca, int slot,= int open) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; - struct az6027_device_state *state =3D (struct az6027_device_state *)d->pr= iv; + struct dvb_usb_device *d =3D ca->data; + struct az6027_device_state *state =3D d->priv; int ret; u8 req; u16 value; @@ -719,7 +719,7 @@ static void az6027_ci_uninit(struct dvb_usb_device *d) if (NULL =3D=3D d) return; =20 - state =3D (struct az6027_device_state *)d->priv; + state =3D d->priv; if (NULL =3D=3D state) return; =20 @@ -735,7 +735,7 @@ static void az6027_ci_uninit(struct dvb_usb_device *d) static int az6027_ci_init(struct dvb_usb_adapter *a) { struct dvb_usb_device *d =3D a->dev; - struct az6027_device_state *state =3D (struct az6027_device_state *)d->pr= iv; + struct az6027_device_state *state =3D d->priv; int ret; =20 deb_info("%s", __func__); diff --git a/drivers/media/usb/dvb-usb/dtt200u-fe.c b/drivers/media/usb/dvb= -usb/dtt200u-fe.c index 9f83560ba63d..586afe22d817 100644 --- a/drivers/media/usb/dvb-usb/dtt200u-fe.c +++ b/drivers/media/usb/dvb-usb/dtt200u-fe.c @@ -195,7 +195,7 @@ static int dtt200u_fe_get_frontend(struct dvb_frontend*= fe, =20 static void dtt200u_fe_release(struct dvb_frontend* fe) { - struct dtt200u_fe_state *state =3D (struct dtt200u_fe_state*) fe->demodul= ator_priv; + struct dtt200u_fe_state *state =3D fe->demodulator_priv; kfree(state); } =20 diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb= /dw2102.c index 0ca764282c76..0477f024e585 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c @@ -903,7 +903,7 @@ static int su3000_streaming_ctrl(struct dvb_usb_adapter= *adap, int onoff) =20 static int su3000_power_ctrl(struct dvb_usb_device *d, int i) { - struct dw2102_state *state =3D (struct dw2102_state *)d->priv; + struct dw2102_state *state =3D d->priv; int ret =3D 0; =20 info("%s: %d, initialized %d", __func__, i, state->initialized); @@ -978,8 +978,7 @@ static int dw210x_set_voltage(struct dvb_frontend *fe, .len =3D 2, }; =20 - struct dvb_usb_adapter *udev_adap =3D - (struct dvb_usb_adapter *)(fe->dvb->priv); + struct dvb_usb_adapter *udev_adap =3D fe->dvb->priv; if (voltage =3D=3D SEC_VOLTAGE_18) msg.buf =3D command_18v; else if (voltage =3D=3D SEC_VOLTAGE_13) @@ -993,9 +992,8 @@ static int dw210x_set_voltage(struct dvb_frontend *fe, static int s660_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage) { - struct dvb_usb_adapter *d =3D - (struct dvb_usb_adapter *)(fe->dvb->priv); - struct dw2102_state *st =3D (struct dw2102_state *)d->dev->priv; + struct dvb_usb_adapter *d =3D fe->dvb->priv; + struct dw2102_state *st =3D d->dev->priv; =20 dw210x_set_voltage(fe, voltage); if (st->old_set_voltage) @@ -1014,8 +1012,7 @@ static void dw210x_led_ctrl(struct dvb_frontend *fe, = int offon) .buf =3D led_off, .len =3D 1 }; - struct dvb_usb_adapter *udev_adap =3D - (struct dvb_usb_adapter *)(fe->dvb->priv); + struct dvb_usb_adapter *udev_adap =3D fe->dvb->priv; =20 if (offon) msg.buf =3D led_on; @@ -1025,9 +1022,8 @@ static void dw210x_led_ctrl(struct dvb_frontend *fe, = int offon) static int tt_s2_4600_read_status(struct dvb_frontend *fe, enum fe_status *status) { - struct dvb_usb_adapter *d =3D - (struct dvb_usb_adapter *)(fe->dvb->priv); - struct dw2102_state *st =3D (struct dw2102_state *)d->dev->priv; + struct dvb_usb_adapter *d =3D fe->dvb->priv; + struct dw2102_state *st =3D d->dev->priv; int ret; =20 ret =3D st->fe_read_status(fe, status); @@ -2576,7 +2572,7 @@ static int dw2102_probe(struct usb_interface *intf, static void dw2102_disconnect(struct usb_interface *intf) { struct dvb_usb_device *d =3D usb_get_intfdata(intf); - struct dw2102_state *st =3D (struct dw2102_state *)d->priv; + struct dw2102_state *st =3D d->priv; struct i2c_client *client; =20 /* remove I2C client for tuner */ diff --git a/drivers/media/usb/dvb-usb/opera1.c b/drivers/media/usb/dvb-usb= /opera1.c index 0da86f58aff6..98b2177667d2 100644 --- a/drivers/media/usb/dvb-usb/opera1.c +++ b/drivers/media/usb/dvb-usb/opera1.c @@ -172,8 +172,7 @@ static int opera1_set_voltage(struct dvb_frontend *fe, struct i2c_msg msg[] =3D { {.addr =3D ADDR_B600_VOLTAGE_13V,.flags =3D 0,.buf =3D command_13v,.len = =3D 1}, }; - struct dvb_usb_adapter *udev_adap =3D - (struct dvb_usb_adapter *)(fe->dvb->priv); + struct dvb_usb_adapter *udev_adap =3D fe->dvb->priv; if (voltage =3D=3D SEC_VOLTAGE_18) { msg[0].addr =3D ADDR_B601_VOLTAGE_18V; msg[0].buf =3D command_18v; diff --git a/drivers/media/usb/dvb-usb/pctv452e.c b/drivers/media/usb/dvb-u= sb/pctv452e.c index f0794c68c622..445aabde61e9 100644 --- a/drivers/media/usb/dvb-usb/pctv452e.c +++ b/drivers/media/usb/dvb-usb/pctv452e.c @@ -106,7 +106,7 @@ struct pctv452e_state { static int tt3650_ci_msg(struct dvb_usb_device *d, u8 cmd, u8 *data, unsigned int write_len, unsigned int read_len) { - struct pctv452e_state *state =3D (struct pctv452e_state *)d->priv; + struct pctv452e_state *state =3D d->priv; u8 *buf; u8 id; unsigned int rlen; @@ -157,8 +157,8 @@ static int tt3650_ci_msg_locked(struct dvb_ca_en50221 *= ca, u8 cmd, u8 *data, unsigned int write_len, unsigned int read_len) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; - struct pctv452e_state *state =3D (struct pctv452e_state *)d->priv; + struct dvb_usb_device *d =3D ca->data; + struct pctv452e_state *state =3D d->priv; int ret; =20 mutex_lock(&state->ca_mutex); @@ -290,8 +290,8 @@ static int tt3650_ci_slot_ts_enable(struct dvb_ca_en502= 21 *ca, int slot) =20 static int tt3650_ci_slot_reset(struct dvb_ca_en50221 *ca, int slot) { - struct dvb_usb_device *d =3D (struct dvb_usb_device *)ca->data; - struct pctv452e_state *state =3D (struct pctv452e_state *)d->priv; + struct dvb_usb_device *d =3D ca->data; + struct pctv452e_state *state =3D d->priv; u8 buf[1]; int ret; =20 @@ -359,7 +359,7 @@ static void tt3650_ci_uninit(struct dvb_usb_device *d) if (NULL =3D=3D d) return; =20 - state =3D (struct pctv452e_state *)d->priv; + state =3D d->priv; if (NULL =3D=3D state) return; =20 @@ -377,7 +377,7 @@ static void tt3650_ci_uninit(struct dvb_usb_device *d) static int tt3650_ci_init(struct dvb_usb_adapter *a) { struct dvb_usb_device *d =3D a->dev; - struct pctv452e_state *state =3D (struct pctv452e_state *)d->priv; + struct pctv452e_state *state =3D d->priv; int ret; =20 ci_dbg("%s", __func__); @@ -415,7 +415,7 @@ static int pctv452e_i2c_msg(struct dvb_usb_device *d, u= 8 addr, const u8 *snd_buf, u8 snd_len, u8 *rcv_buf, u8 rcv_len) { - struct pctv452e_state *state =3D (struct pctv452e_state *)d->priv; + struct pctv452e_state *state =3D d->priv; u8 *buf; u8 id; int ret; @@ -514,7 +514,7 @@ static u32 pctv452e_i2c_func(struct i2c_adapter *adapte= r) =20 static int pctv452e_power_ctrl(struct dvb_usb_device *d, int i) { - struct pctv452e_state *state =3D (struct pctv452e_state *)d->priv; + struct pctv452e_state *state =3D d->priv; u8 *b0, *rx; int ret; =20 @@ -565,7 +565,7 @@ static int pctv452e_power_ctrl(struct dvb_usb_device *d= , int i) =20 static int pctv452e_rc_query(struct dvb_usb_device *d) { - struct pctv452e_state *state =3D (struct pctv452e_state *)d->priv; + struct pctv452e_state *state =3D d->priv; u8 *b, *rx; int ret, i; u8 id; --=20 2.11.0