Remove casts to same type
Subsystems (30)
cover Remove casts to same type
Adding casts of objects to the same type is unnecessary and confusing for a human reader.
Remove them via coccinelle script.
No additional sparse warnings are emitted.
Joe Perches (3):
ethernet: Remove casts to same type
wireless: Remove casts to same type
drivers: net: Remove casts to same type
drivers/net/appletalk/cops.c | 2 +- drivers/net/can/bfin_can.c | 2 +- drivers/net/can/mcp251x.c | 3 +- drivers/net/ethernet/8390/apne.c | 2 +- drivers/net/ethernet/aeroflex/greth.c | 8 ++-- drivers/net/ethernet/amd/declance.c | 4 +- drivers/net/ethernet/apple/macmace.c | 2 +- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 6 +- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 9 ++-- drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 2 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 35 ++++++--------- drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- drivers/net/ethernet/broadcom/bnx2.c | 3 +- drivers/net/ethernet/broadcom/cnic.c | 12 +++--- drivers/net/ethernet/brocade/bna/cna_fwimg.c | 4 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 5 +- drivers/net/ethernet/dec/tulip/de4x5.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/hp/hp100.c | 6 +- drivers/net/ethernet/i825xx/lp486e.c | 8 ++-- drivers/net/ethernet/i825xx/sun3_82586.c | 4 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- drivers/net/ethernet/marvell/pxa168_eth.c | 4 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 4 +- drivers/net/ethernet/neterion/s2io.c | 14 +++--- drivers/net/ethernet/neterion/vxge/vxge-config.c | 8 ++-- drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 +- drivers/net/ethernet/neterion/vxge/vxge-main.c | 8 ++-- drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 5 +- drivers/net/ethernet/sgi/ioc3-eth.c | 4 +- drivers/net/ethernet/smsc/smsc9420.c | 3 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- drivers/net/ethernet/sun/sunqe.c | 2 +- drivers/net/ethernet/via/via-velocity.c | 2 +- drivers/net/fddi/defxx.c | 4 +- drivers/net/fddi/skfp/pmf.c | 8 ++-- drivers/net/hamradio/mkiss.c | 8 ++-- drivers/net/hyperv/netvsc.c | 2 +- drivers/net/irda/ali-ircc.c | 6 +- drivers/net/irda/au1k_ir.c | 2 +- drivers/net/slip/slip.c | 4 +- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- drivers/net/wan/x25_asy.c | 2 +- drivers/net/wimax/i2400m/fw.c | 2 +- drivers/net/wireless/adm8211.c | 3 +- drivers/net/wireless/airo.c | 4 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 3 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 3 +- drivers/net/wireless/ath/carl9170/cmd.c | 2 +- drivers/net/wireless/ath/carl9170/rx.c | 4 +- drivers/net/wireless/atmel.c | 4 +- drivers/net/wireless/b43legacy/dma.c | 2 +- drivers/net/wireless/b43legacy/xmit.c | 6 +-- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 +- drivers/net/wireless/brcm80211/brcmsmac/dma.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +- drivers/net/wireless/hostap/hostap_proc.c | 3 +- drivers/net/wireless/ipw2x00/ipw2200.c | 4 +- drivers/net/wireless/iwlwifi/iwl-testmode.c | 2 +- drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 2 +- drivers/net/wireless/libertas/debugfs.c | 4 +- drivers/net/wireless/libertas/if_usb.c | 2 +- drivers/net/wireless/libertas_tf/if_usb.c | 2 +- drivers/net/wireless/mwifiex/11n.c | 14 ++---- drivers/net/wireless/mwifiex/11n.h | 3 +- drivers/net/wireless/mwifiex/11n_rxreorder.c | 18 ++------ drivers/net/wireless/mwifiex/cfg80211.c | 2 +- drivers/net/wireless/mwifiex/join.c | 20 +++------ drivers/net/wireless/mwifiex/scan.c | 24 ++++------ drivers/net/wireless/mwifiex/sta_cmd.c | 16 ++----- drivers/net/wireless/mwifiex/sta_cmdresp.c | 24 ++++------ drivers/net/wireless/mwifiex/sta_event.c | 2 +- drivers/net/wireless/p54/eeprom.c | 2 +- drivers/net/wireless/p54/fwio.c | 2 +- drivers/net/wireless/prism54/islpci_eth.c | 2 +- drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/rtlwifi/base.c | 2 +- drivers/net/wireless/rtlwifi/cam.c | 2 +- drivers/net/wireless/rtlwifi/core.c | 14 +++--- drivers/net/wireless/rtlwifi/efuse.c | 4 +- drivers/net/wireless/rtlwifi/pci.c | 14 +++--- drivers/net/wireless/rtlwifi/ps.c | 10 ++-- drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 5 +- drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 43 +++++++++--------- drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 43 +++++++++--------- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 6 +- drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 34 +++++++------- drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 6 +- drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 46 +++++++++---------- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 2 +- drivers/net/wireless/ti/wlcore/tx.c | 3 +- drivers/net/wireless/zd1211rw/zd_chip.h | 2 +- drivers/net/wireless/zd1211rw/zd_usb.h | 2 +- 102 files changed, 308 insertions(+), 368 deletions(-)
Signature · 1 line
1.7.8.111.gad25c.dirty
PATCH 1/3 ethernet: Remove casts to same type
Adding casts of objects to the same type is unnecessary and confusing for a human reader.
For example, this cast:
int y;
int *p = (int *)&y;I used the coccinelle script below to find and remove these unnecessary casts. I manually removed the conversions this script produces of casts with __force, __iomem and __user.
@@
type T;
T *p;
@@
- (T *)p
+ p
A function in atl1e_main.c was passed a const pointer when it actually modified elements of the structure.
Change the argument to a non-const pointer.
A function in stmmac needed a __force to avoid a sparse warning. Added it.
--- drivers/net/ethernet/8390/apne.c | 2 +- drivers/net/ethernet/aeroflex/greth.c | 8 ++-- drivers/net/ethernet/amd/declance.c | 4 +- drivers/net/ethernet/apple/macmace.c | 2 +- drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 6 ++-- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 9 ++--- drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 2 +- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 35 ++++++++----------- drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- drivers/net/ethernet/broadcom/bnx2.c | 3 +- drivers/net/ethernet/broadcom/cnic.c | 12 +++--- drivers/net/ethernet/brocade/bna/cna_fwimg.c | 4 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 5 +-- drivers/net/ethernet/dec/tulip/de4x5.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/hp/hp100.c | 6 ++-- drivers/net/ethernet/i825xx/lp486e.c | 8 ++-- drivers/net/ethernet/i825xx/sun3_82586.c | 4 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +- drivers/net/ethernet/marvell/pxa168_eth.c | 4 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 4 +- drivers/net/ethernet/neterion/s2io.c | 14 ++++---- drivers/net/ethernet/neterion/vxge/vxge-config.c | 8 ++-- drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 +- drivers/net/ethernet/neterion/vxge/vxge-main.c | 8 ++-- drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 5 +-- drivers/net/ethernet/sgi/ioc3-eth.c | 4 +- drivers/net/ethernet/smsc/smsc9420.c | 3 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- drivers/net/ethernet/sun/sunqe.c | 2 +- drivers/net/ethernet/via/via-velocity.c | 2 +- 34 files changed, 87 insertions(+), 97 deletions(-)
drivers/net/ethernet/8390/apne.c +1 -1
@@ -454,7 +454,7 @@ apne_block_input(struct net_device *dev, int count, struct sk_buff *skb, int rin buf[count-1 ] =inb (NE_BASE +NE_DATAPORT ); } }else { - ptrc = (char *)buf; + ptrc = buf;for (cnt =0 ; cnt < count; cnt++) *ptrc++ =inb (NE_BASE +NE_DATAPORT ); }
drivers/net/ethernet/aeroflex/greth.c +4 -4
@@ -1014,7 +1014,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p)struct greth_regs *regs; greth =netdev_priv (dev); - regs = (struct greth_regs *) greth->regs; + regs = greth->regs;if (!is_valid_ether_addr (addr->sa_data))return -EADDRNOTAVAIL ;
@@ -1036,7 +1036,7 @@ static void greth_set_hash_filter(struct net_device *dev) {struct netdev_hw_addr *ha;struct greth_private *greth =netdev_priv (dev); -struct greth_regs *regs = (struct greth_regs *) greth->regs; +struct greth_regs *regs = greth->regs;u32 mc_filter[2 ];unsigned int bitnr;
@@ -1055,7 +1055,7 @@ static void greth_set_multicast_list(struct net_device *dev) {int cfg;struct greth_private *greth =netdev_priv (dev); -struct greth_regs *regs = (struct greth_regs *) greth->regs; +struct greth_regs *regs = greth->regs; cfg =GRETH_REGLOAD (regs->control);if (dev->flags &IFF_PROMISC )
@@ -1414,7 +1414,7 @@ static int __devinit greth_of_probe(struct platform_device *ofdev) goto error1; } - regs = (struct greth_regs *) greth->regs; + regs = greth->regs; greth->irq = ofdev->archdata.irqs[0 ];dev_set_drvdata (greth->dev, dev);
drivers/net/ethernet/amd/declance.c +2 -2
@@ -623,7 +623,7 @@ static int lance_rx(struct net_device *dev)skb_put (skb, len);/* make room */ cp_from_buf (lp->type, skb->data, - (char *)lp->rx_buf_ptr_cpu[entry], len); + lp->rx_buf_ptr_cpu[entry], len); skb->protocol =eth_type_trans (skb, dev);netif_rx (skb);
@@ -919,7 +919,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) *lib_ptr (ib, btx_ring[entry].length, lp->type) = (-len); *lib_ptr (ib, btx_ring[entry].misc, lp->type) =0 ; -cp_to_buf (lp->type, (char *)lp->tx_buf_ptr_cpu[entry], skb->data, len); +cp_to_buf (lp->type, lp->tx_buf_ptr_cpu[entry], skb->data, len);/* Now, give the packet to the lance */ *lib_ptr(ib, btx_ring[entry].tmd1, lp->type) =
drivers/net/ethernet/apple/macmace.c +1 -1
@@ -228,7 +228,7 @@ static int __devinit mace_probe(struct platform_device *pdev)* bits are reversed. */ - addr = (void *)MACE_PROM ; + addr =MACE_PROM ;for (j =0 ; j <6 ; ++j) {u8 v =bitrev8 (addr[j<<4 ]);
drivers/net/ethernet/atheros/atl1c/atl1c_hw.c +3 -3
@@ -602,7 +602,7 @@ int atl1c_phy_reset(struct atl1c_hw *hw)int atl1c_phy_init (struct atl1c_hw *hw) { -struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter; +struct atl1c_adapter *adapter = hw->adapter;struct pci_dev *pdev = adapter->pdev;int ret_val;u16 mii_bmcr_data =BMCR_RESET ;
@@ -696,7 +696,7 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex)/* select one link mode to get lower power consumption */ int atl1c_phy_to_ps_link (struct atl1c_hw *hw) { -struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter; +struct atl1c_adapter *adapter = hw->adapter;struct pci_dev *pdev = adapter->pdev;int ret =0 ;u16 autoneg_advertised = ADVERTISED_10baseT_Half;
@@ -768,7 +768,7 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw)int atl1c_power_saving (struct atl1c_hw *hw,u32 wufc) { -struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter; +struct atl1c_adapter *adapter = hw->adapter;struct pci_dev *pdev = adapter->pdev;u32 master_ctrl, mac_ctrl, phy_ctrl;u32 wol_ctrl, speed;
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +4 -5
@@ -989,12 +989,12 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter) }for (i =0 ; i <AT_MAX_TRANSMIT_QUEUE ; i++) { tpd_ring[i].buffer_info = - (struct atl1c_buffer *) (tpd_ring->buffer_info + count); + (tpd_ring->buffer_info + count); count += tpd_ring[i].count; } rfd_ring->buffer_info = - (struct atl1c_buffer *) (tpd_ring->buffer_info + count); + (tpd_ring->buffer_info + count); count += rfd_ring->count; rx_desc_count += rfd_ring->count;
@@ -1227,7 +1227,7 @@ static void atl1c_start_mac(struct atl1c_adapter *adapter)*/ static int atl1c_reset_mac (struct atl1c_hw *hw) { -struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter; +struct atl1c_adapter *adapter = hw->adapter;struct pci_dev *pdev = adapter->pdev;u32 ctrl_data =0 ;
@@ -1531,8 +1531,7 @@ static inline void atl1c_clear_phy_int(struct atl1c_adapter *adapter)static bool atl1c_clean_tx_irq (struct atl1c_adapter *adapter,enum atl1c_trans_queue type) { -struct atl1c_tpd_ring *tpd_ring = (struct atl1c_tpd_ring *) - &adapter->tpd_ring[type]; +struct atl1c_tpd_ring *tpd_ring = &adapter->tpd_ring[type];struct atl1c_buffer *buffer_info;struct pci_dev *pdev = adapter->pdev;u16 next_to_clean =atomic_read (&tpd_ring->next_to_clean);
drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c +1 -1
@@ -268,7 +268,7 @@ static int atl1e_set_eeprom(struct net_device *netdev,if (eeprom_buff ==NULL )return -ENOMEM ; - ptr = (u32 *)eeprom_buff; + ptr = eeprom_buff;if (eeprom->offset &3 ) {/* need read/modify/write of first changed EEPROM word */
drivers/net/ethernet/atheros/atl1e/atl1e_main.c +15 -20
@@ -641,8 +641,7 @@ static int __devinit atl1e_sw_init(struct atl1e_adapter *adapter)*/ static void atl1e_clean_tx_ring (struct atl1e_adapter *adapter) { -struct atl1e_tx_ring *tx_ring = (struct atl1e_tx_ring *) - &adapter->tx_ring; +struct atl1e_tx_ring *tx_ring = &adapter->tx_ring;struct atl1e_tx_buffer *tx_buffer =NULL ;struct pci_dev *pdev = adapter->pdev;u16 index, ring_count;
@@ -686,7 +685,7 @@ static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter)static void atl1e_clean_rx_ring (struct atl1e_adapter *adapter) {struct atl1e_rx_ring *rx_ring = - (struct atl1e_rx_ring *)&adapter->rx_ring; + &adapter->rx_ring;struct atl1e_rx_page_desc *rx_page_desc = rx_ring->rx_page_desc;u16 i, j;
@@ -884,14 +883,12 @@ failed:return err; } -static inline void atl1e_configure_des_ring (const struct atl1e_adapter *adapter) +static inline void atl1e_configure_des_ring (struct atl1e_adapter *adapter) { -struct atl1e_hw *hw = (struct atl1e_hw *)&adapter->hw; -struct atl1e_rx_ring *rx_ring = - (struct atl1e_rx_ring *)&adapter->rx_ring; -struct atl1e_tx_ring *tx_ring = - (struct atl1e_tx_ring *)&adapter->tx_ring; +struct atl1e_hw *hw = &adapter->hw; +struct atl1e_rx_ring *rx_ring = &adapter->rx_ring; +struct atl1e_tx_ring *tx_ring = &adapter->tx_ring;struct atl1e_rx_page_desc *rx_page_desc =NULL ;int i, j;
@@ -932,7 +929,7 @@ static inline void atl1e_configure_des_ring(const struct atl1e_adapter *adapter)static inline void atl1e_configure_tx (struct atl1e_adapter *adapter) { -struct atl1e_hw *hw = (struct atl1e_hw *)&adapter->hw; +struct atl1e_hw *hw = &adapter->hw;u32 dev_ctrl_data =0 ;u32 max_pay_load =0 ;u32 jumbo_thresh =0 ;
@@ -975,7 +972,7 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter)static inline void atl1e_configure_rx (struct atl1e_adapter *adapter) { -struct atl1e_hw *hw = (struct atl1e_hw *)&adapter->hw; +struct atl1e_hw *hw = &adapter->hw;u32 rxf_len =0 ;u32 rxf_low =0 ;u32 rxf_high =0 ;
@@ -1224,8 +1221,7 @@ static inline void atl1e_clear_phy_int(struct atl1e_adapter *adapter)static bool atl1e_clean_tx_irq (struct atl1e_adapter *adapter) { -struct atl1e_tx_ring *tx_ring = (struct atl1e_tx_ring *) - &adapter->tx_ring; +struct atl1e_tx_ring *tx_ring = &adapter->tx_ring;struct atl1e_tx_buffer *tx_buffer =NULL ;u16 hw_next_to_clean =AT_READ_REGW (&adapter->hw,REG_TPD_CONS_IDX );u16 next_to_clean =atomic_read (&tx_ring->next_to_clean);
@@ -1384,15 +1380,14 @@ static struct atl1e_rx_page *atl1e_get_rx_page(struct atl1e_adapter *adapter, (struct atl1e_rx_page_desc *) adapter->rx_ring.rx_page_desc;u8 rx_using = rx_page_desc[que].rx_using; -return (struct atl1e_rx_page *)&(rx_page_desc[que].rx_page[rx_using]); +return &(rx_page_desc[que].rx_page[rx_using]); }static void atl1e_clean_rx_irq (struct atl1e_adapter *adapter,u8 que,int *work_done,int work_to_do) {struct net_device *netdev = adapter->netdev; -struct atl1e_rx_ring *rx_ring = (struct atl1e_rx_ring *) - &adapter->rx_ring; +struct atl1e_rx_ring *rx_ring = &adapter->rx_ring;struct atl1e_rx_page_desc *rx_page_desc = (struct atl1e_rx_page_desc *) rx_ring->rx_page_desc;struct sk_buff *skb =NULL ;
@@ -1576,7 +1571,7 @@ static struct atl1e_tpd_desc *atl1e_get_tpd(struct atl1e_adapter *adapter) tx_ring->next_to_use =0 ;memset (&tx_ring->desc[next_to_use],0 ,sizeof (struct atl1e_tpd_desc )); -return (struct atl1e_tpd_desc *)&tx_ring->desc[next_to_use]; +return &tx_ring->desc[next_to_use]; } static struct atl1e_tx_buffer *
@@ -2061,8 +2056,8 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)if (wufc) {/* get link status */ -atl1e_read_phy_reg (hw,MII_BMSR , (u16 *)&mii_bmsr_data); -atl1e_read_phy_reg (hw,MII_BMSR , (u16 *)&mii_bmsr_data); +atl1e_read_phy_reg (hw,MII_BMSR , &mii_bmsr_data); +atl1e_read_phy_reg (hw,MII_BMSR , &mii_bmsr_data); mii_advertise_data =ADVERTISE_10HALF ;
@@ -2086,7 +2081,7 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)for (i =0 ; i <AT_SUSPEND_LINK_TIMEOUT ; i++) {msleep (100 );atl1e_read_phy_reg (hw,MII_BMSR , - (u16 *)&mii_bmsr_data); + &mii_bmsr_data);if (mii_bmsr_data &BMSR_LSTATUS )break ; }
drivers/net/ethernet/atheros/atlx/atl1.c +1 -1
@@ -1061,7 +1061,7 @@ static s32 atl1_setup_ring_resources(struct atl1_adapter *adapter) goto err_nomem; } rfd_ring->buffer_info = - (struct atl1_buffer *)(tpd_ring->buffer_info + tpd_ring->count); + (tpd_ring->buffer_info + tpd_ring->count);/* * real ring DMA buffer
drivers/net/ethernet/broadcom/bnx2.c +1 -2
@@ -872,8 +872,7 @@ bnx2_alloc_mem(struct bnx2 *bp) bnapi = &bp->bnx2_napi[i]; - sblk = (void *) (status_blk + -BNX2_SBLK_MSIX_ALIGN_SIZE * i); + sblk = (status_blk +BNX2_SBLK_MSIX_ALIGN_SIZE * i); bnapi->status_blk.msix = sblk; bnapi->hw_tx_cons_ptr = &sblk->status_tx_quick_consumer_index;
drivers/net/ethernet/broadcom/cnic.c +6 -6
@@ -2585,7 +2585,7 @@ static void cnic_bnx2x_kwqe_err(struct cnic_dev *dev, struct kwqe *kwqe)return ; } - cqes[0 ] = (struct kcqe *) &kcqe; + cqes[0 ] = &kcqe;cnic_reply_bnx2x_kcqes (dev, ulp_type, cqes,1 ); }
@@ -4665,9 +4665,9 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev) cp->kcq1.sw_prod_idx =0 ; cp->kcq1.hw_prod_idx_ptr = - (u16 *) &sblk->status_completion_producer_index; + &sblk->status_completion_producer_index; - cp->kcq1.status_idx_ptr = (u16 *) &sblk->status_idx; + cp->kcq1.status_idx_ptr = &sblk->status_idx;/* Initialize the kernel complete queue context. */ val = KRNLQ_TYPE_TYPE_KRNLQ | KRNLQ_SIZE_TYPE_SIZE |
@@ -4693,9 +4693,9 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)u32 sb =BNX2_L2CTX_L5_STATUSB_NUM (sb_id); cp->kcq1.hw_prod_idx_ptr = - (u16 *) &msblk->status_completion_producer_index; - cp->kcq1.status_idx_ptr = (u16 *) &msblk->status_idx; - cp->kwq_con_idx_ptr = (u16 *) &msblk->status_cmd_consumer_index; + &msblk->status_completion_producer_index; + cp->kcq1.status_idx_ptr = &msblk->status_idx; + cp->kwq_con_idx_ptr = &msblk->status_cmd_consumer_index; cp->int_num = sb_id <<BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT ;cnic_ctx_wr (dev, kwq_cid_addr,L5_KRNLQ_HOST_QIDX , sb);cnic_ctx_wr (dev, kcq_cid_addr,L5_KRNLQ_HOST_QIDX , sb);
drivers/net/ethernet/brocade/bna/cna_fwimg.c +2 -2
@@ -67,10 +67,10 @@ bfa_cb_image_get_chunk(enum bfi_asic_gen asic_gen, u32 off) {switch (asic_gen) {case BFI_ASIC_GEN_CT : -return (u32 *)(bfi_image_ct_cna + off); +return (bfi_image_ct_cna + off);break ;case BFI_ASIC_GEN_CT2 : -return (u32 *)(bfi_image_ct2_cna + off); +return (bfi_image_ct2_cna + off);break ;default :return NULL ;
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +1 -1
@@ -575,7 +575,7 @@ static void t3_process_tid_release_list(struct work_struct *work)if (!skb) {spin_lock_bh (&td->tid_release_lock); p->ctx = (void *)td->tid_release_list; - td->tid_release_list = (struct t3c_tid_entry *)p; + td->tid_release_list = p;break ; }mk_tid_release (skb, p - td->tid_maps.tid_tab);
drivers/net/ethernet/chelsio/cxgb4/sge.c +1 -1
@@ -753,7 +753,7 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *q, end = (void *)q->desc + part1; }if ((uintptr_t )end &8 )/* 0-pad to multiple of 16 */ - *(u64 *)end =0 ; + *end =0 ; }/**
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +1 -1
@@ -418,7 +418,7 @@ static int fwevtq_handler(struct sge_rspq *rspq, const __be64 *rsp,* restart a TX Ethernet Queue which was stopped for lack of * free TX Queue Descriptors ... */ -const struct cpl_sge_egr_update *p = (void *)cpl; +const struct cpl_sge_egr_update *p = cpl;unsigned int qid =EGR_QID (be32_to_cpu (p->opcode_qid));struct sge *s = &adapter->sge;struct sge_txq *tq;
drivers/net/ethernet/chelsio/cxgb4vf/sge.c +2 -3
@@ -934,7 +934,7 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *tq, end = (void *)tq->desc + part1; }if ((uintptr_t )end &8 )/* 0-pad to multiple of 16 */ - *(u64 *)end =0 ; + *end =0 ; }/**
@@ -1323,8 +1323,7 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)*/ if (unlikely ((void *)sgl == (void *)tq->stat)) { sgl = (void *)tq->desc; - end = (void *)((void *)tq->desc + - ((void *)end - (void *)tq->stat)); + end = ((void *)tq->desc + ((void *)end - (void *)tq->stat)); }write_sgl (skb, tq, sgl, end,0 , addr);
drivers/net/ethernet/dec/tulip/de4x5.c +1 -1
@@ -3973,7 +3973,7 @@ DevicePresent(struct net_device *dev, u_long aprom_addr) tmp =srom_rd (aprom_addr, i); *p++ =cpu_to_le16 (tmp); } -de4x5_dbg_srom ((struct de4x5_srom *)&lp->srom); +de4x5_dbg_srom (&lp->srom); } }
drivers/net/ethernet/freescale/ucc_geth.c +1 -1
@@ -185,7 +185,7 @@ static void mem_disp(u8 *addr, int size)for (; (u32 ) i < (u32 ) addr + size4Aling; i +=4 )printk ("%08x " , *((u32 *) (i)));for (; (u32 ) i < (u32 ) addr + size; i++) -printk ("%02x" , *((u8 *) (i))); +printk ("%02x" , *((i)));if (notAlign ==1 )printk ("\r\n" ); }
drivers/net/ethernet/hp/hp100.c +3 -3
@@ -1217,7 +1217,7 @@ static int hp100_init_rxpdl(struct net_device *dev, ringptr->pdl = pdlptr +1 ; ringptr->pdl_paddr =virt_to_whatever (dev, pdlptr +1 ); - ringptr->skb = (void *)NULL ; + ringptr->skb =NULL ;/* * Write address and length of first PDL Fragment (which is used for
@@ -1243,7 +1243,7 @@ static int hp100_init_txpdl(struct net_device *dev, ringptr->pdl = pdlptr;/* +1; */ ringptr->pdl_paddr =virt_to_whatever (dev, pdlptr);/* +1 */ - ringptr->skb = (void *)NULL ; + ringptr->skb =NULL ;return roundup (MAX_TX_FRAG *2 +2 ,4 ); }
@@ -1628,7 +1628,7 @@ static void hp100_clean_txring(struct net_device *dev)/* Conversion to new PCI API : NOP */ pci_unmap_single (lp->pci_dev, (dma_addr_t ) lp->txrhead->pdl[1 ], lp->txrhead->pdl[2 ],PCI_DMA_TODEVICE );dev_kfree_skb_any (lp->txrhead->skb); - lp->txrhead->skb = (void *)NULL ; + lp->txrhead->skb =NULL ; lp->txrhead = lp->txrhead->next; lp->txrcommit--; }
drivers/net/ethernet/i825xx/lp486e.c +4 -4
@@ -629,10 +629,10 @@ init_i596(struct net_device *dev) {memcpy ((void *)lp->eth_addr, dev->dev_addr,6 ); lp->set_add.command = CmdIASetup; -i596_add_cmd (dev, (struct i596_cmd *)&lp->set_add); +i596_add_cmd (dev, &lp->set_add); lp->tdr.command = CmdTDR; -i596_add_cmd (dev, (struct i596_cmd *)&lp->tdr); +i596_add_cmd (dev, &lp->tdr);if (lp->scb.command &&i596_timeout (dev,"i82596 init" ,200 ))return 1 ;
@@ -737,7 +737,7 @@ i596_cleanup_cmd(struct net_device *dev) { lp =netdev_priv (dev);while (lp->cmd_head) { - cmd = (struct i596_cmd *)lp->cmd_head; + cmd = lp->cmd_head; lp->cmd_head =pa_to_va (lp->cmd_head->pa_next); lp->cmd_backlog--;
@@ -1281,7 +1281,7 @@ static void set_multicast_list(struct net_device *dev) { lp->i596_config[8 ] |=0x01 ; } -i596_add_cmd (dev, (struct i596_cmd *) &lp->set_conf); +i596_add_cmd (dev, &lp->set_conf); } }
drivers/net/ethernet/i825xx/sun3_82586.c +2 -2
@@ -571,7 +571,7 @@ static int init586(struct net_device *dev) }#endif - ptr =alloc_rfa (dev,(void *)ptr);/* init receive-frame-area */ + ptr =alloc_rfa (dev,ptr);/* init receive-frame-area */ /* * alloc xmit-buffs / init xmit_cmds
@@ -584,7 +584,7 @@ static int init586(struct net_device *dev) ptr = (char *) ptr +XMIT_BUFF_SIZE ; p->xmit_buffs[i] = (struct tbd_struct *)ptr;/* TBD */ ptr = (char *) ptr +sizeof (struct tbd_struct ); -if ((void *)ptr > (void *)dev->mem_end) +if (ptr > (void *)dev->mem_end) {printk ("%s: not enough shared-mem for your configuration!\n" ,dev->name);return 1 ;
drivers/net/ethernet/marvell/mv643xx_eth.c +2 -2
@@ -1894,7 +1894,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index) goto out_free; } - rx_desc = (struct rx_desc *)rxq->rx_desc_area; + rx_desc = rxq->rx_desc_area;for (i =0 ; i < rxq->rx_ring_size; i++) {int nexti;
@@ -1999,7 +1999,7 @@ static int txq_init(struct mv643xx_eth_private *mp, int index) txq->tx_desc_area_size = size; - tx_desc = (struct tx_desc *)txq->tx_desc_area; + tx_desc = txq->tx_desc_area;for (i =0 ; i < txq->tx_ring_size; i++) {struct tx_desc *txd = tx_desc + i;int nexti;
drivers/net/ethernet/marvell/pxa168_eth.c +2 -2
@@ -1032,7 +1032,7 @@ static int rxq_init(struct net_device *dev) }memset ((void *)pep->p_rx_desc_area,0 , size);/* initialize the next_desc_ptr links in the Rx descriptors ring */ - p_rx_desc = (struct rx_desc *)pep->p_rx_desc_area; + p_rx_desc = pep->p_rx_desc_area;for (i =0 ; i < rx_desc_num; i++) { p_rx_desc[i].next_desc_ptr = pep->rx_desc_dma + ((i +1 ) % rx_desc_num) *sizeof (struct rx_desc );
@@ -1095,7 +1095,7 @@ static int txq_init(struct net_device *dev) }memset ((void *)pep->p_tx_desc_area,0 , pep->tx_desc_area_size);/* Initialize the next_desc_ptr links in the Tx descriptors ring */ - p_tx_desc = (struct tx_desc *)pep->p_tx_desc_area; + p_tx_desc = pep->p_tx_desc_area;for (i =0 ; i < tx_desc_num; i++) { p_tx_desc[i].next_desc_ptr = pep->tx_desc_dma + ((i +1 ) % tx_desc_num) *sizeof (struct tx_desc );
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +2 -2
@@ -779,7 +779,7 @@ static int qp_res_start_move_to(struct mlx4_dev *dev, int slave, int qpn, r->com.to_state = state; r->com.state =RES_QP_BUSY ;if (qp) - *qp = (struct res_qp *)r; + *qp = r; } }
@@ -832,7 +832,7 @@ static int mr_res_start_move_to(struct mlx4_dev *dev, int slave, int index, r->com.to_state = state; r->com.state =RES_MPT_BUSY ;if (mpt) - *mpt = (struct res_mpt *)r; + *mpt = r; } }
drivers/net/ethernet/neterion/s2io.c +7 -7
@@ -6946,9 +6946,9 @@ static int rxd_owner_bit_reset(struct s2io_nic *sp)if (sp->rxd_mode ==RXD_MODE_3B ) ba = &ring->ba[j][k];if (set_rxd_buffer_pointer (sp, rxdp, ba, &skb, - (u64 *)&temp0_64, - (u64 *)&temp1_64, - (u64 *)&temp2_64, + &temp0_64, + &temp1_64, + &temp2_64, size) == -ENOMEM ) {return 0 ; }
@@ -7149,7 +7149,7 @@ static int s2io_card_up(struct s2io_nic *sp)int i, ret =0 ;struct config_param *config;struct mac_info *mac_control; -struct net_device *dev = (struct net_device *)sp->dev; +struct net_device *dev = sp->dev;u16 interruptible;/* Initialize the H/W I/O registers */
@@ -7325,7 +7325,7 @@ static void s2io_tx_watchdog(struct net_device *dev)static int rx_osm_handler (struct ring_info *ring_data,struct RxD_t * rxdp) {struct s2io_nic *sp = ring_data->nic; -struct net_device *dev = (struct net_device *)ring_data->dev; +struct net_device *dev = ring_data->dev;struct sk_buff *skb = (struct sk_buff *) ((unsigned long )rxdp->Host_Control);int ring_no = ring_data->ring_no;
@@ -7508,7 +7508,7 @@ aggregate:static void s2io_link (struct s2io_nic *sp,int link) { -struct net_device *dev = (struct net_device *)sp->dev; +struct net_device *dev = sp->dev;struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;if (link != sp->last_link_state) {
@@ -8280,7 +8280,7 @@ static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,return -1 ; } - *ip = (struct iphdr *)((u8 *)buffer + ip_off); + *ip = (struct iphdr *)(buffer + ip_off); ip_len = (u8)((*ip)->ihl); ip_len <<=2 ; *tcp = (struct tcphdr *)((unsigned long )*ip + ip_len);
drivers/net/ethernet/neterion/vxge/vxge-config.c +4 -4
@@ -2346,7 +2346,7 @@ void __vxge_hw_blockpool_blocks_add(struct __vxge_hw_blockpool *blockpool)for (i =0 ; i < nreq; i++)vxge_os_dma_malloc_async ( - ((struct __vxge_hw_device *)blockpool->hldev)->pdev, + (blockpool->hldev)->pdev, blockpool->hldev,VXGE_HW_BLOCK_SIZE ); }
@@ -2428,13 +2428,13 @@ __vxge_hw_blockpool_blocks_remove(struct __vxge_hw_blockpool *blockpool)break ;pci_unmap_single ( - ((struct __vxge_hw_device *)blockpool->hldev)->pdev, + (blockpool->hldev)->pdev, ((struct __vxge_hw_blockpool_entry *)p)->dma_addr, ((struct __vxge_hw_blockpool_entry *)p)->length,PCI_DMA_BIDIRECTIONAL );vxge_os_dma_free ( - ((struct __vxge_hw_device *)blockpool->hldev)->pdev, + (blockpool->hldev)->pdev, ((struct __vxge_hw_blockpool_entry *)p)->memblock, &((struct __vxge_hw_blockpool_entry *)p)->acc_handle);
@@ -4059,7 +4059,7 @@ __vxge_hw_vpath_sw_reset(struct __vxge_hw_device *hldev, u32 vp_id)enum vxge_hw_status status =VXGE_HW_OK ;struct __vxge_hw_virtualpath *vpath; - vpath = (struct __vxge_hw_virtualpath *)&hldev->virtual_paths[vp_id]; + vpath = &hldev->virtual_paths[vp_id];if (vpath->ringh) { status =__vxge_hw_ring_reset (vpath->ringh);
drivers/net/ethernet/neterion/vxge/vxge-config.h +1 -1
@@ -1922,7 +1922,7 @@ realloc:/* misaligned, free current one and try allocating * size + VXGE_CACHE_LINE_SIZE memory */ -kfree ((void *) vaddr); +kfree (vaddr); size +=VXGE_CACHE_LINE_SIZE ; realloc_flag =1 ; goto realloc;
drivers/net/ethernet/neterion/vxge/vxge-main.c +4 -4
@@ -1134,7 +1134,7 @@ static void vxge_set_multicast(struct net_device *dev) "%s:%d", __func__, __LINE__); vdev =netdev_priv (dev); - hldev = (struct __vxge_hw_device *)vdev->devh; + hldev = vdev->devh;if (unlikely (!is_vxge_card_up (vdev)))return ;
@@ -3989,16 +3989,16 @@ static void __devinit vxge_print_parm(struct vxgedev *vdev, u64 vpath_mask)continue ;vxge_debug_ll_config (VXGE_TRACE ,"%s: MTU size - %d" , vdev->ndev->name, - ((struct __vxge_hw_device *)(vdev->devh))-> + ((vdev->devh))-> config.vp_config[i].mtu);vxge_debug_init (VXGE_TRACE ,"%s: VLAN tag stripping %s" , vdev->ndev->name, - ((struct __vxge_hw_device *)(vdev->devh))-> + ((vdev->devh))-> config.vp_config[i].rpa_strip_vlan_tag ?"Enabled" :"Disabled" );vxge_debug_ll_config (VXGE_TRACE ,"%s: Max frags : %d" , vdev->ndev->name, - ((struct __vxge_hw_device *)(vdev->devh))-> + ((vdev->devh))-> config.vp_config[i].fifo.max_frags);break ; }
drivers/net/ethernet/neterion/vxge/vxge-traffic.c +2 -3
@@ -533,8 +533,7 @@ __vxge_hw_device_handle_error(struct __vxge_hw_device *hldev, u32 vp_id,/* notify driver */ if (hldev->uld_callbacks->crit_err) - hldev->uld_callbacks->crit_err ( - (struct __vxge_hw_device *)hldev, + hldev->uld_callbacks->crit_err (hldev, type, vp_id); out:
@@ -1322,7 +1321,7 @@ enum vxge_hw_status vxge_hw_ring_rxd_next_completed(/* check whether it is not the end */ if (!own || *t_code ==VXGE_HW_RING_T_CODE_FRM_DROP ) { -vxge_assert (((struct vxge_hw_ring_rxd_1 *)rxdp)->host_control != +vxge_assert ((rxdp)->host_control !=0 ); ++ring->cmpl_cnt;
drivers/net/ethernet/sgi/ioc3-eth.c +2 -2
@@ -583,7 +583,7 @@ static inline void ioc3_rx(struct net_device *dev)unsigned long *rxr;u32 w0, err; - rxr = (unsigned long *) ip->rxr;/* Ring base */ + rxr = ip->rxr;/* Ring base */ rx_entry = ip->rx_ci;/* RX consume index */ n_entry = ip->rx_pi;
@@ -903,7 +903,7 @@ static void ioc3_alloc_rings(struct net_device *dev)if (ip->rxr ==NULL ) {/* Allocate and initialize rx ring. 4kb = 512 entries */ ip->rxr = (unsigned long *)get_zeroed_page (GFP_ATOMIC ); - rxr = (unsigned long *) ip->rxr; + rxr = ip->rxr;if (!rxr)printk ("ioc3_alloc_rings(): get_zeroed_page() failed!\n" );
drivers/net/ethernet/smsc/smsc9420.c +1 -2
@@ -1640,8 +1640,7 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto out_free_io_4;/* descriptors are aligned due to the nature of pci_alloc_consistent */ - pd->tx_ring = (struct smsc9420_dma_desc *) - (pd->rx_ring +RX_RING_SIZE ); + pd->tx_ring = (pd->rx_ring +RX_RING_SIZE ); pd->tx_dma_addr = pd->rx_dma_addr +sizeof (struct smsc9420_dma_desc ) *RX_RING_SIZE ;
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +1 -1
@@ -190,7 +190,7 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)platform_set_drvdata (pdev,NULL ); -iounmap ((void *)priv->ioaddr); +iounmap ((void __force __iomem *)priv->ioaddr); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );release_mem_region (res->start,resource_size (res));
drivers/net/ethernet/sun/sunqe.c +1 -1
@@ -441,7 +441,7 @@ static void qe_rx(struct sunqe *qep) }else {skb_reserve (skb,2 );skb_put (skb, len); -skb_copy_to_linear_data (skb, (unsigned char *) this_qbuf, +skb_copy_to_linear_data (skb, this_qbuf, len); skb->protocol =eth_type_trans (skb, qep->dev);netif_rx (skb);
drivers/net/ethernet/via/via-velocity.c +1 -1
@@ -486,7 +486,7 @@ static void __devinit velocity_get_options(struct velocity_opt *opts, int index,velocity_set_bool_opt (&opts->flags, IP_byte_align[index],IP_ALIG_DEF ,VELOCITY_FLAGS_IP_ALIGN ,"IP_byte_align" , devname);velocity_set_bool_opt (&opts->flags, ValPktLen[index],VAL_PKT_LEN_DEF ,VELOCITY_FLAGS_VAL_PKT_LEN ,"ValPktLen" , devname);velocity_set_int_opt ((int *) &opts->spd_dpx, speed_duplex[index],MED_LNK_MIN ,MED_LNK_MAX ,MED_LNK_DEF ,"Media link mode" , devname); -velocity_set_int_opt ((int *) &opts->wol_opts, wol_opts[index],WOL_OPT_MIN ,WOL_OPT_MAX ,WOL_OPT_DEF ,"Wake On Lan options" , devname); +velocity_set_int_opt (&opts->wol_opts, wol_opts[index],WOL_OPT_MIN ,WOL_OPT_MAX ,WOL_OPT_DEF ,"Wake On Lan options" , devname); opts->numrx = (opts->numrx & ~3 ); }
Signature · 1 line
1.7.8.111.gad25c.dirty
PATCH 2/3 wireless: Remove casts to same type
In reply to Joe PerchesAdding casts of objects to the same type is unnecessary and confusing for a human reader.
For example, this cast:
int y;
int *p = (int *)&y;I used the coccinelle script below to find and remove these unnecessary casts. I manually removed the conversions this script produces of casts with __force, __iomem and __user.
@@
type T;
T *p;
@@
- (T *)p
+ p
Neatened the mwifiex_deauthenticate_infra function which was doing odd things with array pointers and not using is_zero_ether_addr.
--- drivers/net/wireless/adm8211.c | 3 +- drivers/net/wireless/airo.c | 4 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 3 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 3 +- drivers/net/wireless/ath/carl9170/cmd.c | 2 +- drivers/net/wireless/ath/carl9170/rx.c | 4 +- drivers/net/wireless/atmel.c | 4 +- drivers/net/wireless/b43legacy/dma.c | 2 +- drivers/net/wireless/b43legacy/xmit.c | 6 +-- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 +- drivers/net/wireless/brcm80211/brcmsmac/dma.c | 2 +- drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +- drivers/net/wireless/hostap/hostap_proc.c | 3 +- drivers/net/wireless/ipw2x00/ipw2200.c | 4 +- drivers/net/wireless/iwlwifi/iwl-testmode.c | 2 +- drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 2 +- drivers/net/wireless/libertas/debugfs.c | 4 +- drivers/net/wireless/libertas/if_usb.c | 2 +- drivers/net/wireless/libertas_tf/if_usb.c | 2 +- drivers/net/wireless/mwifiex/11n.c | 14 ++---- drivers/net/wireless/mwifiex/11n.h | 3 +- drivers/net/wireless/mwifiex/11n_rxreorder.c | 18 ++------ drivers/net/wireless/mwifiex/cfg80211.c | 2 +- drivers/net/wireless/mwifiex/join.c | 20 +++------ drivers/net/wireless/mwifiex/scan.c | 24 ++++------ drivers/net/wireless/mwifiex/sta_cmd.c | 16 ++----- drivers/net/wireless/mwifiex/sta_cmdresp.c | 24 ++++------ drivers/net/wireless/mwifiex/sta_event.c | 2 +- drivers/net/wireless/p54/eeprom.c | 2 +- drivers/net/wireless/p54/fwio.c | 2 +- drivers/net/wireless/prism54/islpci_eth.c | 2 +- drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/rtlwifi/base.c | 2 +- drivers/net/wireless/rtlwifi/cam.c | 2 +- drivers/net/wireless/rtlwifi/core.c | 14 +++--- drivers/net/wireless/rtlwifi/efuse.c | 4 +- drivers/net/wireless/rtlwifi/pci.c | 14 +++--- drivers/net/wireless/rtlwifi/ps.c | 10 ++-- drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 5 +- drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 43 +++++++++--------- drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 4 +- drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 43 +++++++++--------- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 6 +- drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 34 +++++++------- drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 6 +- drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 46 +++++++++---------- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 2 +- drivers/net/wireless/ti/wlcore/tx.c | 3 +- drivers/net/wireless/zd1211rw/zd_chip.h | 2 +- drivers/net/wireless/zd1211rw/zd_usb.h | 2 +- 55 files changed, 198 insertions(+), 247 deletions(-)
drivers/net/wireless/adm8211.c +1 -2
@@ -1738,8 +1738,7 @@ static int adm8211_alloc_rings(struct ieee80211_hw *dev)return -ENOMEM ; } - priv->tx_ring = (struct adm8211_desc *)(priv->rx_ring + - priv->rx_ring_size); + priv->tx_ring = priv->rx_ring + priv->rx_ring_size; priv->tx_ring_dma = priv->rx_ring_dma +sizeof (struct adm8211_desc ) * priv->rx_ring_size;
drivers/net/wireless/airo.c +2 -2
@@ -1997,7 +1997,7 @@ static int mpi_send_packet (struct net_device *dev)* ------------------------------------------------ */ -memcpy ((char *)ai->txfids[0 ].virtual_host_addr, +memcpy (ai->txfids[0 ].virtual_host_addr, (char *)&wifictlhdr8023,sizeof (wifictlhdr8023)); payloadLen = (__le16 *)(ai->txfids[0].virtual_host_addr +
@@ -4212,7 +4212,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid,airo_print_err (ai->dev->name,"%s: len=%d" , __func__, len); rc =-1 ; }else { -memcpy ((char *)ai->config_desc.virtual_host_addr, +memcpy (ai->config_desc.virtual_host_addr, pBuf, len); rc =issuecommand (ai, &cmd, &rsp);
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +2 -2
@@ -3178,7 +3178,7 @@ static int ar9300_compress_decision(struct ath_hw *ah, mdata_size, length);return -1 ; } -memcpy (mptr, (u8 *) (word +COMP_HDR_LEN ), length); +memcpy (mptr, word +COMP_HDR_LEN , length);ath_dbg (common,EEPROM ,"restored eeprom %d: uncompressed, length %d\n" , it, length);
@@ -3199,7 +3199,7 @@ static int ar9300_compress_decision(struct ath_hw *ah,"restore eeprom %d: block, reference %d, length %d\n" , it, reference, length);ar9300_uncompress_block (ah, mptr, mdata_size, - (u8 *) (word +COMP_HDR_LEN ), length); + (word +COMP_HDR_LEN ), length);break ;default :ath_dbg (common,EEPROM ,"unknown compression code %d\n" , code);
drivers/net/wireless/ath/ath9k/eeprom_4k.c +1 -2
@@ -188,8 +188,7 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah) {#define EEPROM_4K_SIZE (sizeof(struct ar5416_eeprom_4k) / sizeof(u16))struct ath_common *common =ath9k_hw_common (ah); -struct ar5416_eeprom_4k *eep = - (struct ar5416_eeprom_4k *) &ah->eeprom.map4k; +struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;u16 *eepdata, temp, magic, magic2;u32 sum =0 , el;bool need_swap = false;
drivers/net/wireless/ath/ath9k/eeprom_def.c +1 -2
@@ -264,8 +264,7 @@ static u32 ath9k_hw_def_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,static int ath9k_hw_def_check_eeprom (struct ath_hw *ah) { -struct ar5416_eeprom_def *eep = - (struct ar5416_eeprom_def *) &ah->eeprom.def; +struct ar5416_eeprom_def *eep = &ah->eeprom.def;struct ath_common *common =ath9k_hw_common (ah);u16 *eepdata, temp, magic, magic2;u32 sum =0 , el;
drivers/net/wireless/ath/carl9170/cmd.c +1 -1
@@ -138,7 +138,7 @@ int carl9170_reboot(struct ar9170 *ar)if (!cmd)return -ENOMEM ; - err =__carl9170_exec_cmd (ar, (struct carl9170_cmd *)cmd, true); + err =__carl9170_exec_cmd (ar, cmd, true);return err; }
drivers/net/wireless/ath/carl9170/rx.c +2 -2
@@ -161,7 +161,7 @@ static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer)void carl9170_handle_command_response (struct ar9170 *ar,void *buf,u32 len) { -struct carl9170_rsp *cmd = (void *) buf; +struct carl9170_rsp *cmd = buf;struct ieee80211_vif *vif;if (carl9170_check_sequence (ar, cmd->hdr.seq))
@@ -520,7 +520,7 @@ static u8 *carl9170_find_ie(u8 *data, unsigned int len, u8 ie)*/ static void carl9170_ps_beacon (struct ar9170 *ar,void *data,unsigned int len) { -struct ieee80211_hdr *hdr = (void *) data; +struct ieee80211_hdr *hdr = data;struct ieee80211_tim_ie *tim_ie;u8 *tim;u8 tim_len;
drivers/net/wireless/atmel.c +2 -2
@@ -2952,10 +2952,10 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)/* current AP address - only in reassoc frame */ if (is_reassoc) {memcpy (body.ap, priv->CurrentBSSID,6 ); - ssid_el_p = (u8 *)&body.ssid_el_id; + ssid_el_p = &body.ssid_el_id; bodysize =18 + priv->SSID_size; }else { - ssid_el_p = (u8 *)&body.ap[0 ]; + ssid_el_p = &body.ap[0 ]; bodysize =12 + priv->SSID_size; }
drivers/net/wireless/b43legacy/dma.c +1 -1
@@ -52,7 +52,7 @@ struct b43legacy_dmadesc32 *op32_idx2desc(struct b43legacy_dmaring *ring, desc = ring->descbase; desc = &(desc[slot]); -return (struct b43legacy_dmadesc32 *)desc; +return desc; } static void op32_fill_descriptor(struct b43legacy_dmaring *ring,
drivers/net/wireless/b43legacy/xmit.c +2 -4
@@ -269,8 +269,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,b43legacy_generate_plcp_hdr ((struct b43legacy_plcp_hdr4 *) (&txhdr->plcp), plcp_fragment_len, rate); -b43legacy_generate_plcp_hdr ((struct b43legacy_plcp_hdr4 *) - (&txhdr->plcp_fb), plcp_fragment_len, +b43legacy_generate_plcp_hdr (&txhdr->plcp_fb, plcp_fragment_len, rate_fb->hw_value);/* PHY TX Control word */
@@ -340,8 +339,7 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,b43legacy_generate_plcp_hdr ((struct b43legacy_plcp_hdr4 *) (&txhdr->rts_plcp), len, rts_rate); -b43legacy_generate_plcp_hdr ((struct b43legacy_plcp_hdr4 *) - (&txhdr->rts_plcp_fb), +b43legacy_generate_plcp_hdr (&txhdr->rts_plcp_fb, len, rts_rate_fb); hdr = (struct ieee80211_hdr *)(&txhdr->rts_frame); txhdr->rts_dur_fb = hdr->duration_id;
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +2 -2
@@ -2502,7 +2502,7 @@ clkwait:int ret, i; ret =brcmf_sdcard_send_buf (bus->sdiodev, bus->sdiodev->sbwad, -SDIO_FUNC_2 ,F2SYNC , (u8 *) bus->ctrl_frame_buf, +SDIO_FUNC_2 ,F2SYNC , bus->ctrl_frame_buf, (u32 ) bus->ctrl_frame_len);if (ret <0 ) {
@@ -3327,7 +3327,7 @@ static int brcmf_sdbrcm_download_nvram(struct brcmf_sdio *bus) len =brcmf_sdbrcm_get_image (memblock,MEMBLOCK , bus);if (len >0 && len <MEMBLOCK ) { - bufp = (char *)memblock; + bufp = memblock; bufp[len] =0 ; len =brcmf_process_nvram_vars (bufp, len); bufp += len;
drivers/net/wireless/brcm80211/brcmsmac/dma.c +1 -1
@@ -1433,7 +1433,7 @@ void dma_walk_packets(struct dma_pub *dmah, void (*callback_fnc)struct ieee80211_tx_info *tx_info;while (i != end) { - skb = (struct sk_buff *)di->txp[i]; + skb = di->txp[i];if (skb !=NULL ) { tx_info = (struct ieee80211_tx_info *)skb->cb; (callback_fnc)(tx_info, arg_a);
drivers/net/wireless/brcm80211/brcmsmac/main.c +1 -1
@@ -8318,7 +8318,7 @@ brcms_c_attach(struct brcms_info *wl, struct bcma_device *core, uint unit,struct brcms_pub *pub;/* allocate struct brcms_c_info state and its substructures */ - wlc = (struct brcms_c_info *)brcms_c_attach_malloc (unit, &err,0 ); + wlc =brcms_c_attach_malloc (unit, &err,0 );if (wlc ==NULL ) goto fail; wlc->wiphy = wl->wiphy;
drivers/net/wireless/hostap/hostap_proc.c +1 -2
@@ -58,8 +58,7 @@ static int prism2_stats_proc_read(char *page, char **start, off_t off, {char *p = page;local_info_t *local = (local_info_t *) data; -struct comm_tallies_sums *sums = (struct comm_tallies_sums *) - &local->comm_tallies; +struct comm_tallies_sums *sums = &local->comm_tallies;if (off !=0 ) { *eof =1 ;
drivers/net/wireless/ipw2x00/ipw2200.c +1 -3
@@ -7069,9 +7069,7 @@ static int ipw_qos_activate(struct ipw_priv *priv, }IPW_DEBUG_QOS ("QoS sending IPW_CMD_QOS_PARAMETERS\n" ); - err =ipw_send_qos_params_command (priv, - (struct libipw_qos_parameters *) - &(qos_parameters[0 ])); + err =ipw_send_qos_params_command (priv, &qos_parameters[0 ]);if (err)IPW_DEBUG_QOS ("QoS IPW_CMD_QOS_PARAMETERS failed\n" );
drivers/net/wireless/iwlwifi/iwl-testmode.c +1 -1
@@ -170,7 +170,7 @@ static void iwl_testmode_ucode_rx_pkt(struct iwl_priv *priv,void *data;int length; - data = (void *)rxb_addr (rxb); + data =rxb_addr (rxb); length =get_event_length (rxb);if (!data || length ==0 )
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +1 -1
@@ -1354,7 +1354,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, DMA_BIDIRECTIONAL);trace_iwlwifi_dev_tx (trans->dev, - &((struct iwl_tfd *)txq->tfds)[txq->q.write_ptr], + &txq->tfds[txq->q.write_ptr],sizeof (struct iwl_tfd ), &dev_cmd->hdr, firstlen, skb->data + hdr_len, secondlen);
drivers/net/wireless/libertas/debugfs.c +2 -2
@@ -483,7 +483,7 @@ static ssize_t lbs_rdmac_write(struct file *file, res = -EFAULT ; goto out_unlock; } - priv->mac_offset =simple_strtoul ((char *)buf,NULL ,16 ); + priv->mac_offset =simple_strtoul (buf,NULL ,16 ); res = count; out_unlock:free_page (addr);
@@ -565,7 +565,7 @@ static ssize_t lbs_rdbbp_write(struct file *file, res = -EFAULT ; goto out_unlock; } - priv->bbp_offset =simple_strtoul ((char *)buf,NULL ,16 ); + priv->bbp_offset =simple_strtoul (buf,NULL ,16 ); res = count; out_unlock:free_page (addr);
drivers/net/wireless/libertas/if_usb.c +1 -1
@@ -302,7 +302,7 @@ error:static void if_usb_disconnect (struct usb_interface *intf) {struct if_usb_card *cardp =usb_get_intfdata (intf); -struct lbs_private *priv = (struct lbs_private *) cardp->priv; +struct lbs_private *priv = cardp->priv;lbs_deb_enter (LBS_DEB_MAIN );
drivers/net/wireless/libertas_tf/if_usb.c +1 -1
@@ -253,7 +253,7 @@ lbtf_deb_leave(LBTF_DEB_MAIN);static void if_usb_disconnect (struct usb_interface *intf) {struct if_usb_card *cardp =usb_get_intfdata (intf); -struct lbtf_private *priv = (struct lbtf_private *) cardp->priv; +struct lbtf_private *priv = cardp->priv;lbtf_deb_enter (LBTF_DEB_MAIN );
drivers/net/wireless/mwifiex/11n.c +5 -9
@@ -101,8 +101,7 @@ int mwifiex_ret_11n_delba(struct mwifiex_private *priv, {int tid;struct mwifiex_tx_ba_stream_tbl *tx_ba_tbl; -struct host_cmd_ds_11n_delba *del_ba = - (struct host_cmd_ds_11n_delba *) &resp->params.del_ba; +struct host_cmd_ds_11n_delba *del_ba = &resp->params.del_ba;uint16_t del_ba_param_set =le16_to_cpu (del_ba->del_ba_param_set); tid = del_ba_param_set >>DELBA_TID_POS ;
@@ -147,8 +146,7 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv, struct host_cmd_ds_command *resp) {int tid; -struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = - (struct host_cmd_ds_11n_addba_rsp *) &resp->params.add_ba_rsp; +struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &resp->params.add_ba_rsp;struct mwifiex_tx_ba_stream_tbl *tx_ba_tbl; add_ba_rsp->ssn = cpu_to_le16((le16_to_cpu(add_ba_rsp->ssn))
@@ -412,7 +410,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,memcpy ((u8 *) bss_co_2040 +sizeof (struct mwifiex_ie_types_header ), - (u8 *) bss_desc->bcn_bss_co_2040 + + bss_desc->bcn_bss_co_2040 +sizeof (struct ieee_types_header ),le16_to_cpu (bss_co_2040->header.len));
@@ -426,10 +424,8 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv, ext_cap->header.type =cpu_to_le16 (WLAN_EID_EXT_CAPABILITY ); ext_cap->header.len =cpu_to_le16 (sizeof (ext_cap->ext_cap)); -memcpy ((u8 *) ext_cap + -sizeof (struct mwifiex_ie_types_header ), - (u8 *) bss_desc->bcn_ext_cap + -sizeof (struct ieee_types_header ), +memcpy ((u8 *)ext_cap +sizeof (struct mwifiex_ie_types_header ), + bss_desc->bcn_ext_cap +sizeof (struct ieee_types_header ),le16_to_cpu (ext_cap->header.len)); *buffer +=sizeof (struct mwifiex_ie_types_extcap );
drivers/net/wireless/mwifiex/11n.h +1 -2
@@ -105,8 +105,7 @@ static inline u8 mwifiex_space_avail_for_new_ba_stream( priv = adapter->priv[i];if (priv) ba_stream_num +=mwifiex_wmm_list_len ( - (struct list_head *) - &priv->tx_ba_stream_tbl_ptr); + &priv->tx_ba_stream_tbl_ptr); } return ((ba_stream_num <
drivers/net/wireless/mwifiex/11n_rxreorder.c +5 -13
@@ -296,9 +296,7 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta,*/ int mwifiex_cmd_11n_addba_req (struct host_cmd_ds_command *cmd,void *data_buf) { -struct host_cmd_ds_11n_addba_req *add_ba_req = - (struct host_cmd_ds_11n_addba_req *) - &cmd->params.add_ba_req; +struct host_cmd_ds_11n_addba_req *add_ba_req = &cmd->params.add_ba_req; cmd->command =cpu_to_le16 (HostCmd_CMD_11N_ADDBA_REQ); cmd->size =cpu_to_le16 (sizeof (*add_ba_req) +S_DS_GEN );
@@ -320,9 +318,7 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,struct host_cmd_ds_11n_addba_req *cmd_addba_req) { -struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = - (struct host_cmd_ds_11n_addba_rsp *) - &cmd->params.add_ba_rsp; +struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &cmd->params.add_ba_rsp;u8 tid;int win_size;uint16_t block_ack_param_set;
@@ -367,8 +363,7 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,*/ int mwifiex_cmd_11n_delba (struct host_cmd_ds_command *cmd,void *data_buf) { -struct host_cmd_ds_11n_delba *del_ba = (struct host_cmd_ds_11n_delba *) - &cmd->params.del_ba; +struct host_cmd_ds_11n_delba *del_ba = &cmd->params.del_ba; cmd->command =cpu_to_le16 (HostCmd_CMD_11N_DELBA); cmd->size =cpu_to_le16 (sizeof (*del_ba) +S_DS_GEN );
@@ -398,8 +393,7 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv,int start_win, end_win, win_size;u16 pkt_index; - tbl =mwifiex_11n_get_rx_reorder_tbl ((struct mwifiex_private *) priv, - tid, ta); + tbl =mwifiex_11n_get_rx_reorder_tbl (priv, tid, ta);if (!tbl) {if (pkt_type !=PKT_TYPE_BAR )mwifiex_process_rx_packet (priv->adapter, payload);
@@ -520,9 +514,7 @@ mwifiex_del_ba_tbl(struct mwifiex_private *priv, int tid, u8 *peer_mac,int mwifiex_ret_11n_addba_resp (struct mwifiex_private *priv,struct host_cmd_ds_command *resp) { -struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = - (struct host_cmd_ds_11n_addba_rsp *) - &resp->params.add_ba_rsp; +struct host_cmd_ds_11n_addba_rsp *add_ba_rsp = &resp->params.add_ba_rsp;int tid, win_size;struct mwifiex_rx_reorder_tbl *tbl;uint16_t block_ack_param_set;
drivers/net/wireless/mwifiex/cfg80211.c +1 -1
@@ -1703,7 +1703,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter) wdev_priv =wiphy_priv (wiphy); *(unsigned long *)wdev_priv = (unsigned long )adapter; -set_wiphy_dev (wiphy, (struct device *)priv->adapter->dev); +set_wiphy_dev (wiphy, priv->adapter->dev); ret =wiphy_register (wiphy);if (ret <0 ) {
drivers/net/wireless/mwifiex/join.c +7 -13
@@ -1349,22 +1349,16 @@ static int mwifiex_deauthenticate_infra(struct mwifiex_private *priv, u8 *mac) {u8 mac_address[ETH_ALEN ];int ret; -u8 zero_mac[ETH_ALEN ] = {0 ,0 ,0 ,0 ,0 ,0 }; -if (mac) { -if (!memcmp (mac, zero_mac,sizeof (zero_mac))) -memcpy ((u8 *) &mac_address, - (u8 *) &priv->curr_bss_params.bss_descriptor. - mac_address,ETH_ALEN ); -else -memcpy ((u8 *) &mac_address, (u8 *) mac,ETH_ALEN ); - }else { -memcpy ((u8 *) &mac_address, (u8 *) &priv->curr_bss_params. - bss_descriptor.mac_address,ETH_ALEN ); - } +if (!mac ||is_zero_ether_addr (mac)) +memcpy (mac_address, + priv->curr_bss_params.bss_descriptor.mac_address, +ETH_ALEN ); +else +memcpy (mac_address, mac,ETH_ALEN ); ret =mwifiex_send_cmd_sync (priv, HostCmd_CMD_802_11_DEAUTHENTICATE, - HostCmd_ACT_GEN_SET,0 , &mac_address); + HostCmd_ACT_GEN_SET,0 , mac_address);return ret; }
drivers/net/wireless/mwifiex/scan.c +10 -14
@@ -1014,14 +1014,12 @@ mwifiex_ret_802_11_scan_get_tlv_ptrs(struct mwifiex_adapter *adapter,case TLV_TYPE_TSFTIMESTAMP :dev_dbg (adapter->dev,"info: SCAN_RESP: TSF " "timestamp TLV, len = %d\n" , tlv_len); - *tlv_data = (struct mwifiex_ie_types_data *) - current_tlv; + *tlv_data = current_tlv;break ;case TLV_TYPE_CHANNELBANDLIST :dev_dbg (adapter->dev,"info: SCAN_RESP: channel" " band list TLV, len = %d\n" , tlv_len); - *tlv_data = (struct mwifiex_ie_types_data *) - current_tlv; + *tlv_data = current_tlv;break ;default : dev_err(adapter->dev,
@@ -1226,15 +1224,15 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, bss_entry->beacon_buf);break ;case WLAN_EID_BSS_COEX_2040 : - bss_entry->bcn_bss_co_2040 = (u8 *) (current_ptr + -sizeof (struct ieee_types_header )); + bss_entry->bcn_bss_co_2040 = current_ptr + +sizeof (struct ieee_types_header ); bss_entry->bss_co_2040_offset = (u16) (current_ptr +sizeof (struct ieee_types_header ) - bss_entry->beacon_buf);break ;case WLAN_EID_EXT_CAPABILITY : - bss_entry->bcn_ext_cap = (u8 *) (current_ptr + -sizeof (struct ieee_types_header )); + bss_entry->bcn_ext_cap = current_ptr + +sizeof (struct ieee_types_header ); bss_entry->ext_cap_offset = (u16) (current_ptr +sizeof (struct ieee_types_header ) - bss_entry->beacon_buf);
@@ -1683,8 +1681,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv, goto done; }if (element_id ==WLAN_EID_DS_PARAMS ) { - channel = *(u8 *) (current_ptr + -sizeof (struct ieee_types_header )); + channel = *(current_ptr +sizeof (struct ieee_types_header ));break ; }
@@ -2010,12 +2007,11 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)if (curr_bss->bcn_bss_co_2040) curr_bss->bcn_bss_co_2040 = - (u8 *) (curr_bss->beacon_buf + - curr_bss->bss_co_2040_offset); + (curr_bss->beacon_buf + curr_bss->bss_co_2040_offset);if (curr_bss->bcn_ext_cap) - curr_bss->bcn_ext_cap = (u8 *) (curr_bss->beacon_buf + - curr_bss->ext_cap_offset); + curr_bss->bcn_ext_cap = curr_bss->beacon_buf + + curr_bss->ext_cap_offset; }/*
drivers/net/wireless/mwifiex/sta_cmd.c +5 -11
@@ -793,8 +793,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,struct host_cmd_ds_mac_reg_access *mac_reg; cmd->size =cpu_to_le16 (sizeof (*mac_reg) +S_DS_GEN ); - mac_reg = (struct host_cmd_ds_mac_reg_access *) &cmd-> - params.mac_reg; + mac_reg = &cmd->params.mac_reg; mac_reg->action =cpu_to_le16 (cmd_action); mac_reg->offset =cpu_to_le16 ((u16 )le32_to_cpu (reg_rw->offset));
@@ -806,8 +805,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,struct host_cmd_ds_bbp_reg_access *bbp_reg; cmd->size =cpu_to_le16 (sizeof (*bbp_reg) +S_DS_GEN ); - bbp_reg = (struct host_cmd_ds_bbp_reg_access *) - &cmd->params.bbp_reg; + bbp_reg = &cmd->params.bbp_reg; bbp_reg->action =cpu_to_le16 (cmd_action); bbp_reg->offset =cpu_to_le16 ((u16 )le32_to_cpu (reg_rw->offset));
@@ -819,8 +817,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,struct host_cmd_ds_rf_reg_access *rf_reg; cmd->size =cpu_to_le16 (sizeof (*rf_reg) +S_DS_GEN ); - rf_reg = (struct host_cmd_ds_rf_reg_access *) - &cmd->params.rf_reg; + rf_reg = &cmd->params.rf_reg; rf_reg->action =cpu_to_le16 (cmd_action); rf_reg->offset =cpu_to_le16 ((u16 )le32_to_cpu (reg_rw->offset)); rf_reg->value = (u8 )le32_to_cpu (reg_rw->value);
@@ -831,8 +828,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,struct host_cmd_ds_pmic_reg_access *pmic_reg; cmd->size =cpu_to_le16 (sizeof (*pmic_reg) +S_DS_GEN ); - pmic_reg = (struct host_cmd_ds_pmic_reg_access *) &cmd-> - params.pmic_reg; + pmic_reg = &cmd->params.pmic_reg; pmic_reg->action =cpu_to_le16 (cmd_action); pmic_reg->offset =cpu_to_le16 ((u16 )le32_to_cpu (reg_rw->offset));
@@ -844,8 +840,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,struct host_cmd_ds_rf_reg_access *cau_reg; cmd->size =cpu_to_le16 (sizeof (*cau_reg) +S_DS_GEN ); - cau_reg = (struct host_cmd_ds_rf_reg_access *) - &cmd->params.rf_reg; + cau_reg = &cmd->params.rf_reg; cau_reg->action =cpu_to_le16 (cmd_action); cau_reg->offset =cpu_to_le16 ((u16 )le32_to_cpu (reg_rw->offset));
@@ -856,7 +851,6 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd, {struct mwifiex_ds_read_eeprom *rd_eeprom = data_buf;struct host_cmd_ds_802_11_eeprom_access *cmd_eeprom = - (struct host_cmd_ds_802_11_eeprom_access *) &cmd->params.eeprom; cmd->size =cpu_to_le16 (sizeof (*cmd_eeprom) +S_DS_GEN );
drivers/net/wireless/mwifiex/sta_cmdresp.c +9 -15
@@ -227,7 +227,7 @@ static int mwifiex_ret_get_log(struct mwifiex_private *priv, struct mwifiex_ds_get_stats *stats) {struct host_cmd_ds_802_11_get_log *get_log = - (struct host_cmd_ds_802_11_get_log *) &resp->params.get_log; + &resp->params.get_log;if (stats) { stats->mcast_tx_frame =le32_to_cpu (get_log->mcast_tx_frame);
@@ -282,7 +282,7 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,u32 i;int ret =0 ; - tlv_buf = (u8 *) ((u8 *) rate_cfg) + + tlv_buf = ((u8 *)rate_cfg) +sizeof (struct host_cmd_ds_tx_rate_cfg ); tlv_buf_len = *(u16 *) (tlv_buf +sizeof (u16));
@@ -679,39 +679,33 @@ static int mwifiex_ret_reg_access(u16 type, struct host_cmd_ds_command *resp, eeprom = data_buf;switch (type) {case HostCmd_CMD_MAC_REG_ACCESS: - r.mac = (struct host_cmd_ds_mac_reg_access *) - &resp->params.mac_reg; + r.mac = &resp->params.mac_reg; reg_rw->offset =cpu_to_le32 ((u32 )le16_to_cpu (r.mac->offset)); reg_rw->value = r.mac->value;break ;case HostCmd_CMD_BBP_REG_ACCESS: - r.bbp = (struct host_cmd_ds_bbp_reg_access *) - &resp->params.bbp_reg; + r.bbp = &resp->params.bbp_reg; reg_rw->offset =cpu_to_le32 ((u32 )le16_to_cpu (r.bbp->offset)); reg_rw->value =cpu_to_le32 ((u32 ) r.bbp->value);break ;case HostCmd_CMD_RF_REG_ACCESS: - r.rf = (struct host_cmd_ds_rf_reg_access *) - &resp->params.rf_reg; + r.rf = &resp->params.rf_reg; reg_rw->offset =cpu_to_le32 ((u32 )le16_to_cpu (r.rf->offset)); reg_rw->value =cpu_to_le32 ((u32 ) r.bbp->value);break ;case HostCmd_CMD_PMIC_REG_ACCESS: - r.pmic = (struct host_cmd_ds_pmic_reg_access *) - &resp->params.pmic_reg; + r.pmic = &resp->params.pmic_reg; reg_rw->offset =cpu_to_le32 ((u32 )le16_to_cpu (r.pmic->offset)); reg_rw->value =cpu_to_le32 ((u32 ) r.pmic->value);break ;case HostCmd_CMD_CAU_REG_ACCESS: - r.rf = (struct host_cmd_ds_rf_reg_access *) - &resp->params.rf_reg; + r.rf = &resp->params.rf_reg; reg_rw->offset =cpu_to_le32 ((u32 )le16_to_cpu (r.rf->offset)); reg_rw->value =cpu_to_le32 ((u32 ) r.rf->value);break ;case HostCmd_CMD_802_11_EEPROM_ACCESS: - r.eeprom = (struct host_cmd_ds_802_11_eeprom_access *) - &resp->params.eeprom; + r.eeprom = &resp->params.eeprom;pr_debug ("info: EEPROM read len=%x\n" , r.eeprom->byte_count);if (le16_to_cpu (eeprom->byte_count) <le16_to_cpu (r.eeprom->byte_count)) {
@@ -787,7 +781,7 @@ static int mwifiex_ret_subsc_evt(struct mwifiex_private *priv, struct mwifiex_ds_misc_subsc_evt *sub_event) {struct host_cmd_ds_802_11_subsc_evt *cmd_sub_event = - (struct host_cmd_ds_802_11_subsc_evt *)&resp->params.subsc_evt; + &resp->params.subsc_evt;/* For every subscribe event command (Get/Set/Clear), FW reports the * current set of subscribed events*/
drivers/net/wireless/mwifiex/sta_event.c +1 -1
@@ -422,7 +422,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)if (len !=-1 ) { sinfo.filled =STATION_INFO_ASSOC_REQ_IES ; - sinfo.assoc_req_ies = (u8 *)&event->data[len]; + sinfo.assoc_req_ies = &event->data[len]; len = (u8 *)sinfo.assoc_req_ies - (u8 *)&event->frame_control; sinfo.assoc_req_ies_len =
drivers/net/wireless/p54/eeprom.c +1 -1
@@ -905,7 +905,7 @@ int p54_read_eeprom(struct ieee80211_hw *dev)while (eeprom_size) { blocksize =min (eeprom_size, maxblocksize); - ret =p54_download_eeprom (priv, (void *) (eeprom + offset), + ret =p54_download_eeprom (priv, eeprom + offset, offset, blocksize);if (unlikely (ret)) goto free;
drivers/net/wireless/p54/fwio.c +1 -1
@@ -478,7 +478,7 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell)if (priv->rxhw ==PDR_SYNTH_FRONTEND_LONGBOW ) {memcpy (&body->longbow.curve_data, - (void *) entry +sizeof (__le16), + entry +sizeof (__le16), priv->curve_data->entry_size); }else {struct p54_scan_body *chan = &body->normal;
drivers/net/wireless/prism54/islpci_eth.c +1 -1
@@ -455,7 +455,7 @@ islpci_eth_receive(islpci_private *priv) "Error mapping DMA address\n");/* free the skbuf structure before aborting */ -dev_kfree_skb_irq ((struct sk_buff *) skb); +dev_kfree_skb_irq (skb); skb =NULL ;break ; }
drivers/net/wireless/ray_cs.c +1 -1
@@ -1849,7 +1849,7 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id)pr_debug ("ray_cs: interrupt for *dev=%p\n" , dev); local =netdev_priv (dev); - link = (struct pcmcia_device *)local->finder; + link = local->finder;if (!pcmcia_dev_present (link)) {pr_debug ("ray_cs interrupt from device not present or suspended.\n" );
drivers/net/wireless/rtlwifi/base.c +1 -1
@@ -907,7 +907,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)struct ieee80211_hdr *hdr =rtl_get_hdr (skb);struct rtl_priv *rtlpriv =rtl_priv (hw);__le16 fc = hdr->frame_control; -u8 *act = (u8 *) (((u8 *) skb->data +MAC80211_3ADDR_LEN )); +u8 *act = (u8 *)skb->data +MAC80211_3ADDR_LEN ;u8 category;if (!ieee80211_is_action (fc))
drivers/net/wireless/rtlwifi/cam.c +1 -1
@@ -146,7 +146,7 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr, }rtl_cam_program_entry (hw, ul_entry_idx, mac_addr, - (u8 *) key_content, us_config); + key_content, us_config);RT_TRACE (rtlpriv,COMP_SEC ,DBG_DMESG ,"<===\n" );
drivers/net/wireless/rtlwifi/core.c +7 -7
@@ -680,7 +680,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, mac->short_preamble = bss_conf->use_short_preamble; rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_ACK_PREAMBLE , - (u8 *) (&mac->short_preamble)); + &mac->short_preamble); }if (changed &BSS_CHANGED_ERP_SLOT ) {
@@ -693,7 +693,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, mac->slot_time =RTL_SLOT_TIME_20 ; rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_SLOT_TIME , - (u8 *) (&mac->slot_time)); + &mac->slot_time); }if (changed &BSS_CHANGED_HT ) {
@@ -713,7 +713,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,rcu_read_unlock (); rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_SHORTGI_DENSITY , - (u8 *) (&mac->max_mss_density)); + &mac->max_mss_density); rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_AMPDU_FACTOR , &mac->current_ampdu_factor); rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AMPDU_MIN_SPACE,
@@ -801,7 +801,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,u8 mstatus =RT_MEDIA_CONNECT ; rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_H2C_FW_JOINBSSRPT , - (u8 *) (&mstatus)); + &mstatus); ppsc->report_linked = true; } }else {
@@ -809,7 +809,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw,u8 mstatus =RT_MEDIA_DISCONNECT ; rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_H2C_FW_JOINBSSRPT , - (u8 *)(&mstatus)); + &mstatus); ppsc->report_linked = false; } }
@@ -836,7 +836,7 @@ static void rtl_op_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,u8 bibss = (mac->opmode ==NL80211_IFTYPE_ADHOC ) ?1 :0 ; mac->tsf = tsf; - rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_CORRECT_TSF , (u8 *) (&bibss)); + rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_CORRECT_TSF , &bibss); } static void rtl_op_reset_tsf(struct ieee80211_hw *hw,
@@ -845,7 +845,7 @@ static void rtl_op_reset_tsf(struct ieee80211_hw *hw,struct rtl_priv *rtlpriv =rtl_priv (hw);u8 tmp =0 ; - rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_DUAL_TSF_RST , (u8 *) (&tmp)); + rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_DUAL_TSF_RST , &tmp); } static void rtl_op_sta_notify(struct ieee80211_hw *hw,
drivers/net/wireless/rtlwifi/efuse.c +2 -2
@@ -352,7 +352,7 @@ void read_efuse(struct ieee80211_hw *hw, u16 _offset, u16 _size_byte, u8 *pbuf) rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_EFUSE_BYTES , (u8 *)&efuse_utilized); rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_EFUSE_USAGE , - (u8 *)&efuse_usage); + &efuse_usage); done:for (i =0 ; i <EFUSE_MAX_WORD_UNIT ; i++)kfree (efuse_word[i]);
@@ -409,7 +409,7 @@ void efuse_shadow_read(struct ieee80211_hw *hw, u8 type,else if (type ==2 )efuse_shadow_read_2byte (hw, offset, (u16 *) value);else if (type ==4 ) -efuse_shadow_read_4byte (hw, offset, (u32 *) value); +efuse_shadow_read_4byte (hw, offset, value); }
drivers/net/wireless/rtlwifi/pci.c +7 -7
@@ -756,10 +756,10 @@ done:if (index == rtlpci->rxringcount -1 ) rtlpriv->cfg->ops->set_desc ((u8 *)pdesc, false,HW_DESC_RXERO , - (u8 *)&tmp_one); + &tmp_one); rtlpriv->cfg->ops->set_desc ((u8 *)pdesc, false,HW_DESC_RXOWN , - (u8 *)&tmp_one); + &tmp_one); index = (index +1 ) % rtlpci->rxringcount; }
@@ -934,7 +934,7 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw)__skb_queue_tail (&ring->queue, pskb); rtlpriv->cfg->ops->set_desc ((u8 *) pdesc, true,HW_DESC_OWN , - (u8 *)&temp_one); + &temp_one);return ; }
@@ -1126,11 +1126,11 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw) rxbuffersize); rtlpriv->cfg->ops->set_desc ((u8 *) entry, false,HW_DESC_RXOWN , - (u8 *)&tmp_one); + &tmp_one); } rtlpriv->cfg->ops->set_desc ((u8 *) entry, false, -HW_DESC_RXERO , (u8 *)&tmp_one); +HW_DESC_RXERO , &tmp_one); }return 0 ; }
@@ -1263,7 +1263,7 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw) rtlpriv->cfg->ops->set_desc ((u8 *) entry, false,HW_DESC_RXOWN , - (u8 *)&tmp_one); + &tmp_one); } rtlpci->rx_ring[rx_queue_idx].idx =0 ; }
@@ -1422,7 +1422,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb,__skb_queue_tail (&ring->queue, skb); rtlpriv->cfg->ops->set_desc ((u8 *)pdesc, true, -HW_DESC_OWN , (u8 *)&temp_one); +HW_DESC_OWN , &temp_one); if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&
drivers/net/wireless/rtlwifi/ps.c +5 -5
@@ -333,10 +333,10 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode) rpwm_val =0x0C ;/* RF on */ fw_pwrmode =FW_PS_ACTIVE_MODE ; rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_SET_RPWM , - (u8 *) (&rpwm_val)); + &rpwm_val); rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_H2C_FW_PWRMODE , - (u8 *) (&fw_pwrmode)); + &fw_pwrmode); fw_current_inps = false; rtlpriv->cfg->ops->set_hw_reg(hw,
@@ -356,11 +356,11 @@ static void rtl_lps_set_psmode(struct ieee80211_hw *hw, u8 rt_psmode) (u8 *) (&fw_current_inps)); rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_H2C_FW_PWRMODE , - (u8 *) (&ppsc->fwctrl_psmode)); + &ppsc->fwctrl_psmode); rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_SET_RPWM , - (u8 *) (&rpwm_val)); + &rpwm_val); }else {/* Reset the power save related parameters. */ ppsc->dot11_psmode =EACTIVE ;
@@ -446,7 +446,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len) {struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_mac *mac =rtl_mac (rtl_priv (hw)); -struct ieee80211_hdr *hdr = (void *) data; +struct ieee80211_hdr *hdr = data;struct ieee80211_tim_ie *tim_ie;u8 *tim;u8 tim_len;
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c +2 -3
@@ -656,9 +656,8 @@ static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw) }else {if (rtlpriv->dm.current_turbo_edca) {u8 tmp =AC0_BE ; - rtlpriv->cfg->ops->set_hw_reg (hw, -HW_VAR_AC_PARAM , - (u8 *) (&tmp)); + rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_AC_PARAM , + &tmp); rtlpriv->dm.current_turbo_edca = false; } }
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c +2 -2
@@ -168,7 +168,7 @@ static void _rtl92c_write_fw(struct ieee80211_hw *hw, {struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_hal *rtlhal =rtl_hal (rtl_priv (hw)); -u8 *bufferPtr = (u8 *) buffer; +u8 *bufferPtr = buffer;RT_TRACE (rtlpriv,COMP_FW ,DBG_TRACE ,"FW size is %d bytes\n" , size);
@@ -262,7 +262,7 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)return 1 ; pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware; - pfwdata = (u8 *) rtlhal->pfirmware; + pfwdata = rtlhal->pfirmware; fwsize = rtlhal->fwsize;if (IS_FW_HEADER_EXIST (pfwheader)) {
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +21 -22
154 lines not on this page · raw message
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c +2 -2
@@ -605,7 +605,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,struct rtl_ps_ctl *ppsc =rtl_psc (rtl_priv (hw));bool defaultadapter = true;struct ieee80211_sta *sta; -u8 *pdesc = (u8 *) pdesc_tx; +u8 *pdesc = pdesc_tx;u16 seq_number;__le16 fc = hdr->frame_control;u8 fw_qsel =_rtl92ce_map_hwqueue_to_fwqueue (skb, hw_queue);
@@ -806,7 +806,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw,SET_TX_DESC_OWN (pdesc,1 ); -SET_TX_DESC_PKT_SIZE ((u8 *) pdesc, (u16) (skb->len)); +SET_TX_DESC_PKT_SIZE (pdesc, (u16) (skb->len));SET_TX_DESC_FIRST_SEG (pdesc,1 );SET_TX_DESC_LAST_SEG (pdesc,1 );
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c +21 -22
152 lines not on this page · raw message
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +1 -1
@@ -668,7 +668,7 @@ void rtl92cu_tx_fill_cmddesc(struct ieee80211_hw *hw,SET_TX_DESC_RATE_ID (pdesc,7 );SET_TX_DESC_MACID (pdesc,0 );SET_TX_DESC_OWN (pdesc,1 ); -SET_TX_DESC_PKT_SIZE ((u8 *) pdesc, (u16) (skb->len)); +SET_TX_DESC_PKT_SIZE (pdesc, (u16 )skb->len);SET_TX_DESC_FIRST_SEG (pdesc,1 );SET_TX_DESC_LAST_SEG (pdesc,1 );SET_TX_DESC_OFFSET (pdesc,0x20 );
drivers/net/wireless/rtlwifi/rtl8192de/dm.c +1 -1
@@ -696,7 +696,7 @@ static void rtl92d_dm_check_edca_turbo(struct ieee80211_hw *hw)if (rtlpriv->dm.current_turbo_edca) {u8 tmp =AC0_BE ; rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_AC_PARAM , - (u8 *) (&tmp)); + &tmp); rtlpriv->dm.current_turbo_edca = false; } }
drivers/net/wireless/rtlwifi/rtl8192de/fw.c +3 -3
@@ -120,7 +120,7 @@ static void _rtl92d_write_fw(struct ieee80211_hw *hw, {struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_hal *rtlhal =rtl_hal (rtl_priv (hw)); -u8 *bufferPtr = (u8 *) buffer; +u8 *bufferPtr = buffer;u32 pagenums, remainSize;u32 page, offset;
@@ -256,8 +256,8 @@ int rtl92d_download_fw(struct ieee80211_hw *hw)if (rtlpriv->max_fw_size ==0 || !rtlhal->pfirmware)return 1 ; fwsize = rtlhal->fwsize; - pfwheader = (u8 *) rtlhal->pfirmware; - pfwdata = (u8 *) rtlhal->pfirmware; + pfwheader = rtlhal->pfirmware; + pfwdata = rtlhal->pfirmware; rtlhal->fw_version = (u16 )GET_FIRMWARE_HDR_VERSION (pfwheader); rtlhal->fw_subversion = (u16 )GET_FIRMWARE_HDR_SUB_VER (pfwheader); RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
drivers/net/wireless/rtlwifi/rtl8192de/hw.c +17 -17
@@ -235,12 +235,12 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)for (e_aci =0 ; e_aci <AC_MAX ; e_aci++) rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_AC_PARAM , - (u8 *) (&e_aci)); + (&e_aci));break ; }case HW_VAR_ACK_PREAMBLE : {u8 reg_tmp; -u8 short_preamble = (bool ) (*(u8 *) val); +u8 short_preamble = (bool ) (*val); reg_tmp = (mac->cur_40_prime_sc) <<5 ;if (short_preamble)
@@ -252,7 +252,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)u8 min_spacing_to_set;u8 sec_min_space; - min_spacing_to_set = *((u8 *) val); + min_spacing_to_set = *val;if (min_spacing_to_set <=7 ) { sec_min_space =0 ;if (min_spacing_to_set < sec_min_space)
@@ -271,7 +271,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)case HW_VAR_SHORTGI_DENSITY : {u8 density_to_set; - density_to_set = *((u8 *) val); + density_to_set = *val; mac->min_space_cfg = rtlpriv->rtlhal.minspace_cfg; mac->min_space_cfg |= (density_to_set <<3 ); RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,
@@ -293,7 +293,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) regtoSet =0x66626641 ; else regtoSet =0xb972a841 ; - factor_toset = *((u8 *) val); + factor_toset = *val;if (factor_toset <=3 ) { factor_toset = (1 << (factor_toset +2 ));if (factor_toset >0xf )
@@ -316,15 +316,15 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)break ; }case HW_VAR_AC_PARAM : { -u8 e_aci = *((u8 *) val); +u8 e_aci = *val;rtl92d_dm_init_edca_turbo (hw);if (rtlpci->acm_method != eAcmWay2_SW) rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_ACM_CTRL , - (u8 *) (&e_aci)); + &e_aci);break ; }case HW_VAR_ACM_CTRL : { -u8 e_aci = *((u8 *) val); +u8 e_aci = *val;union aci_aifsn *p_aci_aifsn = (union aci_aifsn *)(&(mac->ac[0 ].aifs));u8 acm = p_aci_aifsn->f.acm;
@@ -376,7 +376,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) rtlpci->receive_config = ((u32 *) (val))[0 ];break ;case HW_VAR_RETRY_LIMIT : { -u8 retry_limit = ((u8 *) (val))[0 ]; +u8 retry_limit = val[0 ]; rtl_write_word(rtlpriv, REG_RL, retry_limit << RETRY_LIMIT_SHORT_SHIFT |
@@ -390,16 +390,16 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) rtlefuse->efuse_usedbytes = *((u16 *) val);break ;case HW_VAR_EFUSE_USAGE : - rtlefuse->efuse_usedpercentage = *((u8 *) val); + rtlefuse->efuse_usedpercentage = *val;break ;case HW_VAR_IO_CMD :rtl92d_phy_set_io_cmd (hw, (*(enum io_type *)val));break ;case HW_VAR_WPA_CONFIG : -rtl_write_byte (rtlpriv,REG_SECCFG , *((u8 *) val)); +rtl_write_byte (rtlpriv,REG_SECCFG , *val);break ;case HW_VAR_SET_RPWM : -rtl92d_fill_h2c_cmd (hw,H2C_PWRM ,1 , (u8 *) (val)); +rtl92d_fill_h2c_cmd (hw,H2C_PWRM ,1 , (val));break ;case HW_VAR_H2C_FW_PWRMODE :break ;
@@ -407,7 +407,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) ppsc->fw_current_inpsmode = *((bool *) val);break ;case HW_VAR_H2C_FW_JOINBSSRPT : { -u8 mstatus = (*(u8 *) val); +u8 mstatus = (*val);u8 tmp_regcr, tmp_reg422;bool recover = false;
@@ -435,7 +435,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)rtl_write_byte (rtlpriv,REG_CR +1 , (tmp_regcr & ~(BIT (0 )))); } -rtl92d_set_fw_joinbss_report_cmd (hw, (*(u8 *) val)); +rtl92d_set_fw_joinbss_report_cmd (hw, (*val));break ; }case HW_VAR_AID : {
@@ -447,7 +447,7 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)break ; }case HW_VAR_CORRECT_TSF : { -u8 btype_ibss = ((u8 *) (val))[0 ]; +u8 btype_ibss = val[0 ];if (btype_ibss)_rtl92de_stop_tx_beacon (hw);
@@ -1794,7 +1794,7 @@ static void _rtl92de_read_adapter_info(struct ieee80211_hw *hw) "RTL819X Not boot from eeprom, check it !!\n");return ; } - rtlefuse->eeprom_oemid = *(u8 *)&hwinfo[EEPROM_CUSTOMER_ID ]; + rtlefuse->eeprom_oemid = hwinfo[EEPROM_CUSTOMER_ID ];_rtl92de_read_macphymode_and_bandtype (hw, hwinfo);/* VID, DID SE 0xA-D */
@@ -2115,7 +2115,7 @@ void rtl92de_update_channel_access_setting(struct ieee80211_hw *hw)u16 sifs_timer; rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_SLOT_TIME , - (u8 *)&mac->slot_time); + &mac->slot_time);if (!mac->ht_enable) sifs_timer =0x0a0a ;else
drivers/net/wireless/rtlwifi/rtl8192de/trx.c +3 -3
@@ -560,7 +560,7 @@ void rtl92de_tx_fill_desc(struct ieee80211_hw *hw,struct rtl_hal *rtlhal =rtl_hal (rtlpriv);struct rtl_ps_ctl *ppsc =rtl_psc (rtl_priv (hw));struct ieee80211_sta *sta = info->control.sta; -u8 *pdesc = (u8 *) pdesc_tx; +u8 *pdesc = pdesc_tx;u16 seq_number;__le16 fc = hdr->frame_control;unsigned int buf_len =0 ;
@@ -761,11 +761,11 @@ void rtl92de_tx_fill_cmddesc(struct ieee80211_hw *hw,SET_TX_DESC_QUEUE_SEL (pdesc, fw_queue);SET_TX_DESC_FIRST_SEG (pdesc,1 );SET_TX_DESC_LAST_SEG (pdesc,1 ); -SET_TX_DESC_TX_BUFFER_SIZE (pdesc, (u16) (skb->len)); +SET_TX_DESC_TX_BUFFER_SIZE (pdesc, (u16 )skb->len);SET_TX_DESC_TX_BUFFER_ADDRESS (pdesc, mapping);SET_TX_DESC_RATE_ID (pdesc,7 );SET_TX_DESC_MACID (pdesc,0 ); -SET_TX_DESC_PKT_SIZE ((u8 *) pdesc, (u16) (skb->len)); +SET_TX_DESC_PKT_SIZE (pdesc, (u16) (skb->len));SET_TX_DESC_FIRST_SEG (pdesc,1 );SET_TX_DESC_LAST_SEG (pdesc,1 );SET_TX_DESC_OFFSET (pdesc,0x20 );
drivers/net/wireless/rtlwifi/rtl8192se/dm.c +1 -1
@@ -146,7 +146,7 @@ static void _rtl92s_dm_check_edca_turbo(struct ieee80211_hw *hw)if (rtlpriv->dm.current_turbo_edca) {u8 tmp =AC0_BE ; rtlpriv->cfg->ops->set_hw_reg (hw,HW_VAR_AC_PARAM , - (u8 *)(&tmp)); + &tmp); rtlpriv->dm.current_turbo_edca = false; } }
drivers/net/wireless/rtlwifi/rtl8192se/hw.c +22 -24
171 lines not on this page · raw message
drivers/net/wireless/rtlwifi/rtl8192se/trx.c +1 -1
@@ -599,7 +599,7 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw,struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));struct rtl_hal *rtlhal =rtl_hal (rtl_priv (hw));struct ieee80211_sta *sta = info->control.sta; -u8 *pdesc = (u8 *) pdesc_tx; +u8 *pdesc = pdesc_tx;u16 seq_number;__le16 fc = hdr->frame_control;u8 reserved_macid =0 ;
drivers/net/wireless/ti/wlcore/tx.c +1 -2
@@ -871,8 +871,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,/* Called upon reception of a TX complete interrupt */ void wl1271_tx_complete (struct wl1271 *wl) { -struct wl1271_acx_mem_map *memmap = - (struct wl1271_acx_mem_map *)wl->target_mem_map; +struct wl1271_acx_mem_map *memmap = wl->target_mem_map;u32 count, fw_counter;u32 i;
drivers/net/wireless/zd1211rw/zd_chip.h +1 -1
@@ -827,7 +827,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values,static inline int zd_ioread32_locked (struct zd_chip *chip,u32 *value,const zd_addr_t addr) { -return zd_ioread32v_locked (chip, value, (const zd_addr_t *)&addr,1 ); +return zd_ioread32v_locked (chip, value, &addr,1 ); } static inline int zd_iowrite16_locked(struct zd_chip *chip, u16 value,
drivers/net/wireless/zd1211rw/zd_usb.h +1 -1
@@ -274,7 +274,7 @@ int zd_usb_ioread16v(struct zd_usb *usb, u16 *values,static inline int zd_usb_ioread16 (struct zd_usb *usb,u16 *value,const zd_addr_t addr) { -return zd_usb_ioread16v (usb, value, (const zd_addr_t *)&addr,1 ); +return zd_usb_ioread16v (usb, value, &addr,1 ); }void zd_usb_iowrite16v_async_start (struct zd_usb *usb);
Signature · 1 line
1.7.8.111.gad25c.dirty
PATCH 3/3 drivers: net: Remove casts to same type
In reply to Joe PerchesAdding casts of objects to the same type is unnecessary and confusing for a human reader.
For example, this cast:
int y;
int *p = (int *)&y;I used the coccinelle script below to find and remove these unnecessary casts. I manually removed the conversions this script produces of casts with __force, __iomem and __user.
@@
type T;
T *p;
@@
- (T *)p
+ p
--- drivers/net/appletalk/cops.c | 2 +- drivers/net/can/bfin_can.c | 2 +- drivers/net/can/mcp251x.c | 3 +-- drivers/net/fddi/defxx.c | 4 ++-- drivers/net/fddi/skfp/pmf.c | 8 ++++---- drivers/net/hamradio/mkiss.c | 8 ++++---- drivers/net/hyperv/netvsc.c | 2 +- drivers/net/irda/ali-ircc.c | 6 +++--- drivers/net/irda/au1k_ir.c | 2 +- drivers/net/slip/slip.c | 4 ++-- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- drivers/net/wan/x25_asy.c | 2 +- drivers/net/wimax/i2400m/fw.c | 2 +- 13 files changed, 23 insertions(+), 24 deletions(-)
drivers/net/appletalk/cops.c +1 -1
@@ -936,7 +936,7 @@ static int cops_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) {struct cops_local *lp =netdev_priv (dev);struct sockaddr_at *sa = (struct sockaddr_at *)&ifr->ifr_addr; -struct atalk_addr *aa = (struct atalk_addr *)&lp->node_addr; +struct atalk_addr *aa = &lp->node_addr;switch (cmd) {
drivers/net/can/bfin_can.c +1 -1
@@ -597,7 +597,7 @@ static int __devinit bfin_can_probe(struct platform_device *pdev)dev_info (&pdev->dev,"%s device registered" "(®_base=%p, rx_irq=%d, tx_irq=%d, err_irq=%d, sclk=%d)\n" , -DRV_NAME , (void *)priv->membase, priv->rx_irq, +DRV_NAME , priv->membase, priv->rx_irq, priv->tx_irq, priv->err_irq, priv->can.clock.freq);return 0 ;
drivers/net/can/mcp251x.c +1 -2
@@ -1020,8 +1020,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi) GFP_DMA);if (priv->spi_tx_buf) { - priv->spi_rx_buf = (u8 *)(priv->spi_tx_buf + - (PAGE_SIZE /2 )); + priv->spi_rx_buf = (priv->spi_tx_buf + (PAGE_SIZE /2 )); priv->spi_rx_dma = (dma_addr_t)(priv->spi_tx_dma + (PAGE_SIZE /2 )); }else {
drivers/net/fddi/defxx.c +2 -2
@@ -2962,7 +2962,7 @@ static int dfx_rcv_init(DFX_board_t *bp, int get_buffers) bp->descr_block_virt->rcv_data[i+j].long_0 = (u32) (PI_RCV_DESCR_M_SOP | ((PI_RCV_DATA_K_SIZE_MAX /PI_ALIGN_K_RCV_DATA_BUFF ) <<PI_RCV_DESCR_V_SEG_LEN )); bp->descr_block_virt->rcv_data[i+j].long_1 = (u32) (bp->rcv_block_phys + (i *PI_RCV_DATA_K_SIZE_MAX )); - bp->p_rcv_buff_va[i+j] = (char *) (bp->rcv_block_virt + (i * PI_RCV_DATA_K_SIZE_MAX)); + bp->p_rcv_buff_va[i+j] = (bp->rcv_block_virt + (i * PI_RCV_DATA_K_SIZE_MAX)); }#endif }
@@ -3030,7 +3030,7 @@ static void dfx_rcv_queue_process(#ifdef DYNAMIC_BUFFERS p_buff = (char *) (((struct sk_buff *)bp->p_rcv_buff_va[entry])->data);#else - p_buff = (char *) bp->p_rcv_buff_va[entry]; + p_buff = bp->p_rcv_buff_va[entry];#endif memcpy (&descr, p_buff +RCV_BUFF_K_DESCR ,sizeof (u32));
drivers/net/fddi/skfp/pmf.c +4 -4
@@ -1242,7 +1242,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,if (len <8 ) goto len_error ;if (set) -memcpy ((char *) to,(char *) from+2 ,6 ) ; +memcpy (to,from+2 ,6 ) ; to +=8 ; from +=8 ; len -=8 ;
@@ -1251,7 +1251,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,if (len <4 ) goto len_error ;if (set) -memcpy ((char *) to,(char *) from,4 ) ; +memcpy (to,from,4 ) ; to +=4 ; from +=4 ; len -=4 ;
@@ -1260,7 +1260,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,if (len <8 ) goto len_error ;if (set) -memcpy ((char *) to,(char *) from,8 ) ; +memcpy (to,from,8 ) ; to +=8 ; from +=8 ; len -=8 ;
@@ -1269,7 +1269,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index,if (len <32 ) goto len_error ;if (set) -memcpy ((char *) to,(char *) from,32 ) ; +memcpy (to,from,32 ) ; to +=32 ; from +=32 ; len -=32 ;
drivers/net/hamradio/mkiss.c +4 -4
@@ -485,7 +485,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)return ;default : - count =kiss_esc (p, (unsigned char *)ax->xbuff, len); + count =kiss_esc (p, ax->xbuff, len); } }else {unsigned short crc;
@@ -497,7 +497,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)case CRC_MODE_SMACK : *p |=0x80 ; crc =swab16 (crc16 (0 , p, len)); - count =kiss_esc_crc (p, (unsigned char *)ax->xbuff, crc, len+2 ); + count =kiss_esc_crc (p, ax->xbuff, crc, len+2 );break ;case CRC_MODE_FLEX_TEST : ax->crcmode =CRC_MODE_NONE ;
@@ -506,11 +506,11 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)case CRC_MODE_FLEX : *p |=0x20 ; crc =calc_crc_flex (p, len); - count =kiss_esc_crc (p, (unsigned char *)ax->xbuff, crc, len+2 ); + count =kiss_esc_crc (p, ax->xbuff, crc, len+2 );break ;default : - count =kiss_esc (p, (unsigned char *)ax->xbuff, len); + count =kiss_esc (p, ax->xbuff, len); } }spin_unlock_bh (&ax->buflock);
drivers/net/hyperv/netvsc.c +1 -1
@@ -614,7 +614,7 @@ retry_send_cmplt:static void netvsc_receive_completion (void *context) {struct hv_netvsc_packet *packet = context; -struct hv_device *device = (struct hv_device *)packet->device; +struct hv_device *device = packet->device;struct netvsc_device *net_device;u64 transaction_id =0 ;bool fsend_receive_comp = false;
drivers/net/irda/ali-ircc.c +3 -3
@@ -1017,7 +1017,7 @@ static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 baud) {int iobase; -struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv; +struct ali_ircc_cb *self = priv;struct net_device *dev;IRDA_DEBUG (1 ,"%s(), ---------------- Start ----------------\n" , __func__ );
@@ -1052,7 +1052,7 @@ static void ali_ircc_fir_change_speed(struct ali_ircc_cb *priv, __u32 baud)*/ static void ali_ircc_sir_change_speed (struct ali_ircc_cb *priv,__u32 speed) { -struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv; +struct ali_ircc_cb *self = priv;unsigned long flags;int iobase;int fcr;/* FIFO control reg */
@@ -1121,7 +1121,7 @@ static void ali_ircc_sir_change_speed(struct ali_ircc_cb *priv, __u32 speed)static void ali_ircc_change_dongle_speed (struct ali_ircc_cb *priv,int speed) { -struct ali_ircc_cb *self = (struct ali_ircc_cb *) priv; +struct ali_ircc_cb *self = priv;int iobase,dongle_id;int tmp =0 ;
drivers/net/irda/au1k_ir.c +1 -1
@@ -794,7 +794,7 @@ static int __devinit au1k_irda_net_init(struct net_device *dev)/* allocate the data buffers */ aup->db[0 ].vaddr = - (void *)dma_alloc (MAX_BUF_SIZE *2 *NUM_IR_DESC , &temp); +dma_alloc (MAX_BUF_SIZE *2 *NUM_IR_DESC , &temp);if (!aup->db[0 ].vaddr) goto out3;
drivers/net/slip/slip.c +2 -2
@@ -390,10 +390,10 @@ static void sl_encaps(struct slip *sl, unsigned char *icp, int len)#endif #ifdef CONFIG_SLIP_MODE_SLIP6 if (sl->mode &SL_MODE_SLIP6 ) - count =slip_esc6 (p, (unsigned char *) sl->xbuff, len); + count =slip_esc6 (p, sl->xbuff, len); else#endif - count =slip_esc (p, (unsigned char *) sl->xbuff, len); + count =slip_esc (p, sl->xbuff, len);/* Order of next two lines is *very* important. * When we are sending a little amount of data,
drivers/net/vmxnet3/vmxnet3_drv.c +1 -1
@@ -1037,7 +1037,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,#endif dev_dbg (&adapter->netdev->dev,"txd[%u]: SOP 0x%Lx 0x%x 0x%x\n" , - (u32)((union Vmxnet3_GenericDesc *)ctx.sop_txd - + (u32)(ctx.sop_txd - tq->tx_ring.base),le64_to_cpu (gdesc->txd.addr),le32_to_cpu (gdesc->dword[2 ]),le32_to_cpu (gdesc->dword[3 ]));
drivers/net/wan/x25_asy.c +1 -1
@@ -231,7 +231,7 @@ static void x25_asy_encaps(struct x25_asy *sl, unsigned char *icp, int len) } p = icp; - count =x25_asy_esc (p, (unsigned char *) sl->xbuff, len); + count =x25_asy_esc (p, sl->xbuff, len);/* Order of next two lines is *very* important. * When we are sending a little amount of data,
drivers/net/wimax/i2400m/fw.c +1 -1
@@ -1268,7 +1268,7 @@ int i2400m_fw_check(struct i2400m *i2400m, const void *bcf, size_t bcf_size)size_t leftover, offset, header_len, size; leftover = top - itr; - offset = itr - (const void *) bcf; + offset = itr - bcf;if (leftover <=sizeof (*bcf_hdr)) { dev_err(dev, "firmware %s: %zu B left at @%zx, " "not enough for BCF header\n",
Signature · 1 line
1.7.8.111.gad25c.dirty
Quoted 5 lines · Joe Perches
Adding casts of objects to the same type is unnecessary and confusing for a human reader.
Remove them via coccinelle script.
Can you also post the coccinelle script ?
did you have to edit them any futher, or is it 100% script ?
Quoted 5 lines · Jim Cromie
Quoted 3 lines · Joe Perches
Adding casts of objects to the same type is unnecessary and confusing for a human reader.
Remove them via coccinelle script.Can you also post the coccinelle script ?
Hi Jim.
I did that with each patch, but here it is again:
$ cat norecast.cocci @@ type T; T *p; @@
- (T *)p
+ p
$
Quoted 1 line
did you have to edit them any futher, or is it 100% script ?
Also from each patch:
I manually removed the conversions this script produces of casts with __force, __iomem and __user.
Also, I did delete a few unnecessary parentheses left over after the casts were removed.
David Miller
maintainerFrom: Joe Perches <[email protected]>
Date: Mon, 4 Jun 2012 15:44:15 -0700
Quoted 11 lines
Adding casts of objects to the same type is unnecessary and confusing for a human reader.
Remove them via coccinelle script.
No additional sparse warnings are emitted.
Joe Perches (3):
ethernet: Remove casts to same type
wireless: Remove casts to same type
drivers: net: Remove casts to same type
All applied, thanks Joe.