Commit 3223eeaf authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'remove-unnecessary-void-conversions' 

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: default avatarJakub Kicinski <kuba@kernel.org>
parents dfa2f048 1d5123ef

drivers/net/can/sja1000/ems_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

{

	struct ems_pci_card *card = (struct ems_pci_card *)priv->priv;

	struct ems_pci_card *card = priv->priv;



	/* reset int flag of pita */

	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)

{

	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);

}
@@ -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)

{

	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);

}

drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c

+6 −6
Original line number Diff line number Diff line
@@ -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)

{

	struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv;

	struct hw_atl2_priv *priv = self->priv;

	int err;



	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)

{

	struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv;

	u8 *prio_tc_map = self->aq_nic_cfg->prio_tc_map;

	struct hw_atl2_priv *priv = self->priv;

	u16 action;

	u8 index;

	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 &&

			  !hw_atl_rpfl2promiscuous_mode_en_get(self)) ?

				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;



	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)

{

	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;

	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 },

	};



	struct hw_atl2_priv *priv = (struct hw_atl2_priv *)self->priv;

	struct aq_nic_cfg_s *aq_nic_cfg = self->aq_nic_cfg;

	struct hw_atl2_priv *priv = self->priv;

	u8 base_index, count;

	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,

			       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;

	u8 index;

	int i;

drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c

+1 −1
Original line number Diff line number Diff line
@@ -413,8 +413,8 @@ do { \ 


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 hw_atl2_priv *priv = self->priv;

	struct statistics_s stats;

	struct version_s version;

	int err;

drivers/net/ethernet/brocade/bna/bnad.c

+6 −7
Original line number Diff line number Diff line
@@ -1037,8 +1037,7 @@ bnad_cb_ccb_destroy(struct bnad *bnad, struct bna_ccb *ccb) 
static void

bnad_cb_tx_stall(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;

	u32 txq_id;

	int i;
@@ -1056,7 +1055,7 @@ bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx) 
static void

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;

	u32 txq_id;

	int i;
@@ -1133,7 +1132,7 @@ bnad_tx_cleanup(struct delayed_work *work) 
static void

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;

	int i;
@@ -1149,7 +1148,7 @@ bnad_cb_tx_cleanup(struct bnad *bnad, struct bna_tx *tx) 
static void

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 bnad_rx_ctrl *rx_ctrl;

	int i;
@@ -1208,7 +1207,7 @@ bnad_rx_cleanup(void *work) 
static void

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 bnad_rx_ctrl *rx_ctrl;

	int i;
@@ -1231,7 +1230,7 @@ bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx) 
static void

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_rcb *rcb;

	struct bnad_rx_ctrl *rx_ctrl;

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

	struct hns3_nic_priv *nic_priv = (struct hns3_nic_priv *)handle->priv;

	struct hnae3_knic_private_info *kinfo = &handle->kinfo;

	struct hns3_nic_priv *nic_priv = handle->priv;

	struct hns3_enet_ring *ring;

	u8 *stat;

	int i, j;