iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'remove-unnecessary-void-conversions'

Browse Source 
Wu Yunchuan says:

====================
Remove unnecessary (void*) conversions

Remove (void*) conversions under "drivers/net" directory.

PATCH v2 link:
https://lore.kernel.org/all/20230710063828.172593-1-suhui@nfschina.com/
PATCH v1 link:
https://lore.kernel.org/all/20230628024121.1439149-1-yunchuan@nfschina.com/
====================

Link: https://lore.kernel.org/r/20230717030937.53818-1-yunchuan@nfschina.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2023-07-18 19:01:07 -07:00
commit 3223eeaf05
12 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/can/sja1000/ems_pci.c
View File

@ -148,7 +148,7 @@ static void ems_pci_v1_write_reg(const struct sja1000_priv *priv,
static void ems_pci_v1_post_irq(const struct sja1000_priv *priv) static void ems_pci_v1_post_irq(const struct sja1000_priv *priv)
{ {
struct ems_pci_card *card = (struct ems_pci_card *)priv->priv; struct ems_pci_card *card = priv->priv;
/* reset int flag of pita */ /* reset int flag of pita */
writel(PITA2_ICR_INT0_EN | PITA2_ICR_INT0, writel(PITA2_ICR_INT0_EN | PITA2_ICR_INT0,
@ -168,7 +168,7 @@ static void ems_pci_v2_write_reg(const struct sja1000_priv *priv,
static void ems_pci_v2_post_irq(const struct sja1000_priv *priv) static void ems_pci_v2_post_irq(const struct sja1000_priv *priv)
{ {
struct ems_pci_card *card = (struct ems_pci_card *)priv->priv; struct ems_pci_card *card = priv->priv;
writel(PLX_ICSR_ENA_CLR, card->conf_addr + PLX_ICSR); writel(PLX_ICSR_ENA_CLR, card->conf_addr + PLX_ICSR);
} }
@ -186,7 +186,7 @@ static void ems_pci_v3_write_reg(const struct sja1000_priv *priv,
static void ems_pci_v3_post_irq(const struct sja1000_priv *priv) static void ems_pci_v3_post_irq(const struct sja1000_priv *priv)
{ {
struct ems_pci_card *card = (struct ems_pci_card *)priv->priv; struct ems_pci_card *card = priv->priv;
writel(ASIX_LINTSR_INT0AC, card->conf_addr + ASIX_LINTSR); writel(ASIX_LINTSR_INT0AC, card->conf_addr + ASIX_LINTSR);
} }

12
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
View File

@ -93,7 +93,7 @@ static u32 hw_atl2_sem_act_rslvr_get(struct aq_hw_s *self)
static int hw_atl2_hw_reset(struct aq_hw_s *self) static int hw_atl2_hw_reset(struct aq_hw_s *self)
{ {
struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv; struct hw_atl2_priv *priv = self->priv;
int err; int err;
err = hw_atl2_utils_soft_reset(self); err = hw_atl2_utils_soft_reset(self);
@ -378,8 +378,8 @@ static int hw_atl2_hw_init_tx_path(struct aq_hw_s *self)
static void hw_atl2_hw_init_new_rx_filters(struct aq_hw_s *self) static void hw_atl2_hw_init_new_rx_filters(struct aq_hw_s *self)
{ {
struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv;
u8 *prio_tc_map = self->aq_nic_cfg->prio_tc_map; u8 *prio_tc_map = self->aq_nic_cfg->prio_tc_map;
struct hw_atl2_priv *priv = self->priv;
u16 action; u16 action;
u8 index; u8 index;
int i; int i;
@ -433,7 +433,7 @@ static void hw_atl2_hw_new_rx_filter_vlan_promisc(struct aq_hw_s *self,
u16 off_action = (!promisc && u16 off_action = (!promisc &&
!hw_atl_rpfl2promiscuous_mode_en_get(self)) ? !hw_atl_rpfl2promiscuous_mode_en_get(self)) ?
HW_ATL2_ACTION_DROP : HW_ATL2_ACTION_DISABLE; HW_ATL2_ACTION_DROP : HW_ATL2_ACTION_DISABLE;
struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv; struct hw_atl2_priv *priv = self->priv;
u8 index; u8 index;
index = priv->art_base_index + HW_ATL2_RPF_VLAN_PROMISC_OFF_INDEX; index = priv->art_base_index + HW_ATL2_RPF_VLAN_PROMISC_OFF_INDEX;
@ -445,7 +445,7 @@ static void hw_atl2_hw_new_rx_filter_vlan_promisc(struct aq_hw_s *self,
static void hw_atl2_hw_new_rx_filter_promisc(struct aq_hw_s *self, bool promisc) static void hw_atl2_hw_new_rx_filter_promisc(struct aq_hw_s *self, bool promisc)
{ {
u16 off_action = promisc ? HW_ATL2_ACTION_DISABLE : HW_ATL2_ACTION_DROP; u16 off_action = promisc ? HW_ATL2_ACTION_DISABLE : HW_ATL2_ACTION_DROP;
struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv; struct hw_atl2_priv *priv = self->priv;
bool vlan_promisc_enable; bool vlan_promisc_enable;
u8 index; u8 index;
@ -539,8 +539,8 @@ static int hw_atl2_hw_init(struct aq_hw_s *self, const u8 *mac_addr)
[AQ_HW_IRQ_MSIX] = { 0x20000022U, 0x20000026U }, [AQ_HW_IRQ_MSIX] = { 0x20000022U, 0x20000026U },
}; };
struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv;
struct aq_nic_cfg_s *aq_nic_cfg = self->aq_nic_cfg; struct aq_nic_cfg_s *aq_nic_cfg = self->aq_nic_cfg;
struct hw_atl2_priv *priv = self->priv;
u8 base_index, count; u8 base_index, count;
int err; int err;
@ -770,7 +770,7 @@ static struct aq_stats_s *hw_atl2_utils_get_hw_stats(struct aq_hw_s *self)
static int hw_atl2_hw_vlan_set(struct aq_hw_s *self, static int hw_atl2_hw_vlan_set(struct aq_hw_s *self,
struct aq_rx_filter_vlan *aq_vlans) struct aq_rx_filter_vlan *aq_vlans)
{ {
struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv; struct hw_atl2_priv *priv = self->priv;
u32 queue; u32 queue;
u8 index; u8 index;
int i; int i;

2
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c
View File

@ -413,8 +413,8 @@ do { \
static int aq_a2_fw_update_stats(struct aq_hw_s *self) static int aq_a2_fw_update_stats(struct aq_hw_s *self)
{ {
struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv;
struct aq_stats_s *cs = &self->curr_stats; struct aq_stats_s *cs = &self->curr_stats;
struct hw_atl2_priv *priv = self->priv;
struct statistics_s stats; struct statistics_s stats;
struct version_s version; struct version_s version;
int err; int err;

13
drivers/net/ethernet/brocade/bna/bnad.c
View File

@ -1037,8 +1037,7 @@ bnad_cb_ccb_destroy(struct bnad *bnad, struct bna_ccb *ccb)
static void static void
bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx) bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx)
{ {
struct bnad_tx_info *tx_info = struct bnad_tx_info *tx_info = tx->priv;
(struct bnad_tx_info *)tx->priv;
struct bna_tcb *tcb; struct bna_tcb *tcb;
u32 txq_id; u32 txq_id;
int i; int i;
@ -1056,7 +1055,7 @@ bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx)
static void static void
bnad_cb_tx_resume(struct bnad *bnad, struct bna_tx *tx) bnad_cb_tx_resume(struct bnad *bnad, struct bna_tx *tx)
{ {
struct bnad_tx_info *tx_info = (struct bnad_tx_info *)tx->priv; struct bnad_tx_info *tx_info = tx->priv;
struct bna_tcb *tcb; struct bna_tcb *tcb;
u32 txq_id; u32 txq_id;
int i; int i;
@ -1133,7 +1132,7 @@ bnad_tx_cleanup(struct delayed_work *work)
static void static void
bnad_cb_tx_cleanup(struct bnad *bnad, struct bna_tx *tx) bnad_cb_tx_cleanup(struct bnad *bnad, struct bna_tx *tx)
{ {
struct bnad_tx_info *tx_info = (struct bnad_tx_info *)tx->priv; struct bnad_tx_info *tx_info = tx->priv;
struct bna_tcb *tcb; struct bna_tcb *tcb;
int i; int i;
@ -1149,7 +1148,7 @@ bnad_cb_tx_cleanup(struct bnad *bnad, struct bna_tx *tx)
static void static void
bnad_cb_rx_stall(struct bnad *bnad, struct bna_rx *rx) bnad_cb_rx_stall(struct bnad *bnad, struct bna_rx *rx)
{ {
struct bnad_rx_info *rx_info = (struct bnad_rx_info *)rx->priv; struct bnad_rx_info *rx_info = rx->priv;
struct bna_ccb *ccb; struct bna_ccb *ccb;
struct bnad_rx_ctrl *rx_ctrl; struct bnad_rx_ctrl *rx_ctrl;
int i; int i;
@ -1208,7 +1207,7 @@ bnad_rx_cleanup(void *work)
static void static void
bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx) bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx)
{ {
struct bnad_rx_info *rx_info = (struct bnad_rx_info *)rx->priv; struct bnad_rx_info *rx_info = rx->priv;
struct bna_ccb *ccb; struct bna_ccb *ccb;
struct bnad_rx_ctrl *rx_ctrl; struct bnad_rx_ctrl *rx_ctrl;
int i; int i;
@ -1231,7 +1230,7 @@ bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx)
static void static void
bnad_cb_rx_post(struct bnad *bnad, struct bna_rx *rx) bnad_cb_rx_post(struct bnad *bnad, struct bna_rx *rx)
{ {
struct bnad_rx_info *rx_info = (struct bnad_rx_info *)rx->priv; struct bnad_rx_info *rx_info = rx->priv;
struct bna_ccb *ccb; struct bna_ccb *ccb;
struct bna_rcb *rcb; struct bna_rcb *rcb;
struct bnad_rx_ctrl *rx_ctrl; struct bnad_rx_ctrl *rx_ctrl;

2
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
View File

@ -569,8 +569,8 @@ static void hns3_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
static u64 *hns3_get_stats_tqps(struct hnae3_handle *handle, u64 *data) static u64 *hns3_get_stats_tqps(struct hnae3_handle *handle, u64 *data)
{ {
struct hns3_nic_priv *nic_priv = (struct hns3_nic_priv *)handle->priv;
struct hnae3_knic_private_info *kinfo = &handle->kinfo; struct hnae3_knic_private_info *kinfo = &handle->kinfo;
struct hns3_nic_priv *nic_priv = handle->priv;
struct hns3_enet_ring *ring; struct hns3_enet_ring *ring;
u8 *stat; u8 *stat;
int i, j; int i, j;

10
drivers/net/ethernet/hisilicon/hns_mdio.c
View File

@ -217,7 +217,7 @@ static void hns_mdio_cmd_write(struct hns_mdio_device *mdio_dev,
static int hns_mdio_write_c22(struct mii_bus *bus, static int hns_mdio_write_c22(struct mii_bus *bus,
int phy_id, int regnum, u16 data) int phy_id, int regnum, u16 data)
{ {
struct hns_mdio_device *mdio_dev = (struct hns_mdio_device *)bus->priv; struct hns_mdio_device *mdio_dev = bus->priv;
u16 reg = (u16)(regnum & 0xffff); u16 reg = (u16)(regnum & 0xffff);
u16 cmd_reg_cfg; u16 cmd_reg_cfg;
int ret; int ret;
@ -259,7 +259,7 @@ static int hns_mdio_write_c22(struct mii_bus *bus,
static int hns_mdio_write_c45(struct mii_bus *bus, int phy_id, int devad, static int hns_mdio_write_c45(struct mii_bus *bus, int phy_id, int devad,
int regnum, u16 data) int regnum, u16 data)
{ {
struct hns_mdio_device *mdio_dev = (struct hns_mdio_device *)bus->priv; struct hns_mdio_device *mdio_dev = bus->priv;
u16 reg = (u16)(regnum & 0xffff); u16 reg = (u16)(regnum & 0xffff);
u16 cmd_reg_cfg; u16 cmd_reg_cfg;
int ret; int ret;
@ -312,7 +312,7 @@ static int hns_mdio_write_c45(struct mii_bus *bus, int phy_id, int devad,
*/ */
static int hns_mdio_read_c22(struct mii_bus *bus, int phy_id, int regnum) static int hns_mdio_read_c22(struct mii_bus *bus, int phy_id, int regnum)
{ {
struct hns_mdio_device *mdio_dev = (struct hns_mdio_device *)bus->priv; struct hns_mdio_device *mdio_dev = bus->priv;
u16 reg = (u16)(regnum & 0xffff); u16 reg = (u16)(regnum & 0xffff);
u16 reg_val; u16 reg_val;
int ret; int ret;
@ -363,7 +363,7 @@ static int hns_mdio_read_c22(struct mii_bus *bus, int phy_id, int regnum)
static int hns_mdio_read_c45(struct mii_bus *bus, int phy_id, int devad, static int hns_mdio_read_c45(struct mii_bus *bus, int phy_id, int devad,
int regnum) int regnum)
{ {
struct hns_mdio_device *mdio_dev = (struct hns_mdio_device *)bus->priv; struct hns_mdio_device *mdio_dev = bus->priv;
u16 reg = (u16)(regnum & 0xffff); u16 reg = (u16)(regnum & 0xffff);
u16 reg_val; u16 reg_val;
int ret; int ret;
@ -424,7 +424,7 @@ static int hns_mdio_read_c45(struct mii_bus *bus, int phy_id, int devad,
*/ */
static int hns_mdio_reset(struct mii_bus *bus) static int hns_mdio_reset(struct mii_bus *bus)
{ {
struct hns_mdio_device *mdio_dev = (struct hns_mdio_device *)bus->priv; struct hns_mdio_device *mdio_dev = bus->priv;
const struct hns_mdio_sc_reg *sc_reg; const struct hns_mdio_sc_reg *sc_reg;
int ret; int ret;

4
drivers/net/ethernet/intel/ice/ice_main.c
View File

@ -6249,7 +6249,7 @@ static void ice_tx_dim_work(struct work_struct *work)
u16 itr; u16 itr;
dim = container_of(work, struct dim, work); dim = container_of(work, struct dim, work);
rc = (struct ice_ring_container *)dim->priv; rc = dim->priv;
WARN_ON(dim->profile_ix >= ARRAY_SIZE(tx_profile)); WARN_ON(dim->profile_ix >= ARRAY_SIZE(tx_profile));
@ -6269,7 +6269,7 @@ static void ice_rx_dim_work(struct work_struct *work)
u16 itr; u16 itr;
dim = container_of(work, struct dim, work); dim = container_of(work, struct dim, work);
rc = (struct ice_ring_container *)dim->priv; rc = dim->priv;
WARN_ON(dim->profile_ix >= ARRAY_SIZE(rx_profile)); WARN_ON(dim->profile_ix >= ARRAY_SIZE(rx_profile));

4
drivers/net/ethernet/smsc/smsc911x.c
View File

@ -552,7 +552,7 @@ static void smsc911x_mac_write(struct smsc911x_data *pdata,
/* Get a phy register */ /* Get a phy register */
static int smsc911x_mii_read(struct mii_bus *bus, int phyaddr, int regidx) static int smsc911x_mii_read(struct mii_bus *bus, int phyaddr, int regidx)
{ {
struct smsc911x_data *pdata = (struct smsc911x_data *)bus->priv; struct smsc911x_data *pdata = bus->priv;
unsigned long flags; unsigned long flags;
unsigned int addr; unsigned int addr;
int i, reg; int i, reg;
@ -591,7 +591,7 @@ out:
static int smsc911x_mii_write(struct mii_bus *bus, int phyaddr, int regidx, static int smsc911x_mii_write(struct mii_bus *bus, int phyaddr, int regidx,
u16 val) u16 val)
{ {
struct smsc911x_data *pdata = (struct smsc911x_data *)bus->priv; struct smsc911x_data *pdata = bus->priv;
unsigned long flags; unsigned long flags;
unsigned int addr; unsigned int addr;
int i, reg; int i, reg;

4
drivers/net/ethernet/smsc/smsc9420.c
View File

@ -102,7 +102,7 @@ static inline void smsc9420_pci_flush_write(struct smsc9420_pdata *pd)
static int smsc9420_mii_read(struct mii_bus *bus, int phyaddr, int regidx) static int smsc9420_mii_read(struct mii_bus *bus, int phyaddr, int regidx)
{ {
struct smsc9420_pdata *pd = (struct smsc9420_pdata *)bus->priv; struct smsc9420_pdata *pd = bus->priv;
unsigned long flags; unsigned long flags;
u32 addr; u32 addr;
int i, reg = -EIO; int i, reg = -EIO;
@ -140,7 +140,7 @@ out:
static int smsc9420_mii_write(struct mii_bus *bus, int phyaddr, int regidx, static int smsc9420_mii_write(struct mii_bus *bus, int phyaddr, int regidx,
u16 val) u16 val)
{ {
struct smsc9420_pdata *pd = (struct smsc9420_pdata *)bus->priv; struct smsc9420_pdata *pd = bus->priv;
unsigned long flags; unsigned long flags;
u32 addr; u32 addr;
int i, reg = -EIO; int i, reg = -EIO;

4
drivers/net/mdio/mdio-xgene.c
View File

@ -79,7 +79,7 @@ EXPORT_SYMBOL(xgene_mdio_wr_mac);
int xgene_mdio_rgmii_read(struct mii_bus *bus, int phy_id, int reg) int xgene_mdio_rgmii_read(struct mii_bus *bus, int phy_id, int reg)
{ {
struct xgene_mdio_pdata *pdata = (struct xgene_mdio_pdata *)bus->priv; struct xgene_mdio_pdata *pdata = bus->priv;
u32 data, done; u32 data, done;
u8 wait = 10; u8 wait = 10;
@ -105,7 +105,7 @@ EXPORT_SYMBOL(xgene_mdio_rgmii_read);
int xgene_mdio_rgmii_write(struct mii_bus *bus, int phy_id, int reg, u16 data) int xgene_mdio_rgmii_write(struct mii_bus *bus, int phy_id, int reg, u16 data)
{ {
struct xgene_mdio_pdata *pdata = (struct xgene_mdio_pdata *)bus->priv; struct xgene_mdio_pdata *pdata = bus->priv;
u32 val, done; u32 val, done;
u8 wait = 10; u8 wait = 10;

4
drivers/net/ppp/pppoe.c
View File

@ -968,7 +968,7 @@ abort:
***********************************************************************/ ***********************************************************************/
static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb) static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb)
{ {
struct sock *sk = (struct sock *)chan->private; struct sock *sk = chan->private;
return __pppoe_xmit(sk, skb); return __pppoe_xmit(sk, skb);
} }
@ -976,7 +976,7 @@ static int pppoe_fill_forward_path(struct net_device_path_ctx *ctx,
struct net_device_path *path, struct net_device_path *path,
const struct ppp_channel *chan) const struct ppp_channel *chan)
{ {
struct sock *sk = (struct sock *)chan->private; struct sock *sk = chan->private;
struct pppox_sock *po = pppox_sk(sk); struct pppox_sock *po = pppox_sk(sk);
struct net_device *dev = po->pppoe_dev; struct net_device *dev = po->pppoe_dev;

4
drivers/net/ppp/pptp.c
View File

@ -148,7 +148,7 @@ static struct rtable *pptp_route_output(const struct pppox_sock *po,
static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
{ {
struct sock *sk = (struct sock *) chan->private; struct sock *sk = chan->private;
struct pppox_sock *po = pppox_sk(sk); struct pppox_sock *po = pppox_sk(sk);
struct net *net = sock_net(sk); struct net *net = sock_net(sk);
struct pptp_opt *opt = &po->proto.pptp; struct pptp_opt *opt = &po->proto.pptp;
@ -575,7 +575,7 @@ out:
static int pptp_ppp_ioctl(struct ppp_channel *chan, unsigned int cmd, static int pptp_ppp_ioctl(struct ppp_channel *chan, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
struct sock *sk = (struct sock *) chan->private; struct sock *sk = chan->private;
struct pppox_sock *po = pppox_sk(sk); struct pppox_sock *po = pppox_sk(sk);
struct pptp_opt *opt = &po->proto.pptp; struct pptp_opt *opt = &po->proto.pptp;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;