netdevice: safe convert to netdev_priv() #part-2

We have some reasons to kill netdev->priv:
1. netdev->priv is equal to netdev_priv().
2. netdev_priv() wraps the calculation of netdev->priv's offset, obviously
   netdev_priv() is more flexible than netdev->priv.
But we cann't kill netdev->priv, because so many drivers reference to it
directly.

This patch is a safe convert for netdev->priv to netdev_priv(netdev).
Since all of the netdev->priv is only for read.
But it is too big to be sent in one mail.
I split it to 4 parts and make every part smaller than 100,000 bytes,
which is max size allowed by vger.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 39 insertions, 39 deletions

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index cec9fe0b1132..62369341cb2c 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -357,7 +357,7 @@ static void s2io_vlan_rx_register(struct net_device *dev,
                                         struct vlan_group *grp)
 {
         int i;
-        struct s2io_nic *nic = dev->priv;
+        struct s2io_nic *nic = netdev_priv(dev);
         unsigned long flags[MAX_TX_FIFOS];
         struct mac_info *mac_control = &nic->mac_control;
         struct config_param *config = &nic->config;
@@ -375,7 +375,7 @@ static void s2io_vlan_rx_register(struct net_device *dev,
 static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)
 {
         int i;
-        struct s2io_nic *nic = dev->priv;
+        struct s2io_nic *nic = netdev_priv(dev);
         unsigned long flags[MAX_TX_FIFOS];
         struct mac_info *mac_control = &nic->mac_control;
         struct config_param *config = &nic->config;
@@ -2837,7 +2837,7 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
         int pkts_processed = 0;
         u8 __iomem *addr = NULL;
         u8 val8 = 0;
-        struct s2io_nic *nic = dev->priv;
+        struct s2io_nic *nic = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = nic->bar0;
         int budget_org = budget;
 
@@ -2909,7 +2909,7 @@ static int s2io_poll_inta(struct napi_struct *napi, int budget)
  */
 static void s2io_netpoll(struct net_device *dev)
 {
-        struct s2io_nic *nic = dev->priv;
+        struct s2io_nic *nic = netdev_priv(dev);
         struct mac_info *mac_control;
         struct config_param *config;
         struct XENA_dev_config __iomem *bar0 = nic->bar0;
@@ -3171,7 +3171,7 @@ static void tx_intr_handler(struct fifo_info *fifo_data)
 static void s2io_mdio_write(u32 mmd_type, u64 addr, u16 value, struct net_device *dev)
 {
         u64 val64 = 0x0;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
 
         //address transaction
@@ -3220,7 +3220,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev)
 {
         u64 val64 = 0x0;
         u64 rval64 = 0x0;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
 
         /* address transaction */
@@ -3324,7 +3324,7 @@ static void s2io_updt_xpak_counter(struct net_device *dev)
         u64 val64 = 0x0;
         u64 addr  = 0x0;
 
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct stat_block *stat_info = sp->mac_control.stats_info;
 
         /* Check the communication with the MDIO slave */
@@ -3990,7 +3990,7 @@ static void remove_inta_isr(struct s2io_nic *sp)
 
 static int s2io_open(struct net_device *dev)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         int err = 0;
 
         /*
@@ -4048,7 +4048,7 @@ hw_init_failed:
 
 static int s2io_close(struct net_device *dev)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct config_param *config = &sp->config;
         u64 tmp64;
         int offset;
@@ -4087,7 +4087,7 @@ static int s2io_close(struct net_device *dev)
 
 static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         u16 frg_cnt, frg_len, i, queue, queue_len, put_off, get_off;
         register u64 val64;
         struct TxD *txdp;
@@ -4485,7 +4485,7 @@ static int do_s2io_chk_alarm_bit(u64 value, void __iomem * addr,
 static void s2io_handle_errors(void * dev_id)
 {
         struct net_device *dev = (struct net_device *) dev_id;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
         u64 temp64 = 0,val64=0;
         int i = 0;
@@ -4752,7 +4752,7 @@ reset:
 static irqreturn_t s2io_isr(int irq, void *dev_id)
 {
         struct net_device *dev = (struct net_device *) dev_id;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
         int i;
         u64 reason = 0;
@@ -4881,7 +4881,7 @@ static void s2io_updt_stats(struct s2io_nic *sp)
 
 static struct net_device_stats *s2io_get_stats(struct net_device *dev)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct mac_info *mac_control;
         struct config_param *config;
         int i;
@@ -4948,7 +4948,7 @@ static void s2io_set_multicast(struct net_device *dev)
 {
         int i, j, prev_cnt;
         struct dev_mc_list *mclist;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
         u64 val64 = 0, multi_mac = 0x010203040506ULL, mask =
             0xfeffffffffffULL;
@@ -5277,7 +5277,7 @@ static int s2io_set_mac_addr(struct net_device *dev, void *p)
 
 static int do_s2io_prog_unicast(struct net_device *dev, u8 *addr)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         register u64 mac_addr = 0, perm_addr = 0;
         int i;
         u64 tmp64;
@@ -5336,7 +5336,7 @@ static int do_s2io_prog_unicast(struct net_device *dev, u8 *addr)
 static int s2io_ethtool_sset(struct net_device *dev,
                              struct ethtool_cmd *info)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         if ((info->autoneg == AUTONEG_ENABLE) ||
             (info->speed != SPEED_10000) || (info->duplex != DUPLEX_FULL))
                 return -EINVAL;
@@ -5362,7 +5362,7 @@ static int s2io_ethtool_sset(struct net_device *dev,
 
 static int s2io_ethtool_gset(struct net_device *dev, struct ethtool_cmd *info)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         info->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
         info->advertising = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
         info->port = PORT_FIBRE;
@@ -5397,7 +5397,7 @@ static int s2io_ethtool_gset(struct net_device *dev, struct ethtool_cmd *info)
 static void s2io_ethtool_gdrvinfo(struct net_device *dev,
                                   struct ethtool_drvinfo *info)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         strncpy(info->driver, s2io_driver_name, sizeof(info->driver));
         strncpy(info->version, s2io_driver_version, sizeof(info->version));
@@ -5427,7 +5427,7 @@ static void s2io_ethtool_gregs(struct net_device *dev,
         int i;
         u64 reg;
         u8 *reg_space = (u8 *) space;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         regs->len = XENA_REG_SPACE;
         regs->version = sp->pdev->subsystem_device;
@@ -5487,7 +5487,7 @@ static void s2io_phy_id(unsigned long data)
 static int s2io_ethtool_idnic(struct net_device *dev, u32 data)
 {
         u64 val64 = 0, last_gpio_ctrl_val;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
         u16 subid;
 
@@ -5525,7 +5525,7 @@ static int s2io_ethtool_idnic(struct net_device *dev, u32 data)
 static void s2io_ethtool_gringparam(struct net_device *dev,
                                     struct ethtool_ringparam *ering)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         int i,tx_desc_count=0,rx_desc_count=0;
 
         if (sp->rxd_mode == RXD_MODE_1)
@@ -5568,7 +5568,7 @@ static void s2io_ethtool_getpause_data(struct net_device *dev,
                                        struct ethtool_pauseparam *ep)
 {
         u64 val64;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
 
         val64 = readq(&bar0->rmac_pause_cfg);
@@ -5595,7 +5595,7 @@ static int s2io_ethtool_setpause_data(struct net_device *dev,
                                struct ethtool_pauseparam *ep)
 {
         u64 val64;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct XENA_dev_config __iomem *bar0 = sp->bar0;
 
         val64 = readq(&bar0->rmac_pause_cfg);
@@ -5825,7 +5825,7 @@ static int s2io_ethtool_geeprom(struct net_device *dev,
 {
         u32 i, valid;
         u64 data;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         eeprom->magic = sp->pdev->vendor | (sp->pdev->device << 16);
 
@@ -5863,7 +5863,7 @@ static int s2io_ethtool_seeprom(struct net_device *dev,
 {
         int len = eeprom->len, cnt = 0;
         u64 valid = 0, data;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         if (eeprom->magic != (sp->pdev->vendor | (sp->pdev->device << 16))) {
                 DBG_PRINT(ERR_DBG,
@@ -6243,7 +6243,7 @@ static void s2io_ethtool_test(struct net_device *dev,
                               struct ethtool_test *ethtest,
                               uint64_t * data)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         int orig_state = netif_running(sp->dev);
 
         if (ethtest->flags == ETH_TEST_FL_OFFLINE) {
@@ -6299,7 +6299,7 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
                                    u64 * tmp_stats)
 {
         int i = 0, k;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         struct stat_block *stat_info = sp->mac_control.stats_info;
 
         s2io_updt_stats(sp);
@@ -6578,14 +6578,14 @@ static int s2io_ethtool_get_regs_len(struct net_device *dev)
 
 static u32 s2io_ethtool_get_rx_csum(struct net_device * dev)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         return (sp->rx_csum);
 }
 
 static int s2io_ethtool_set_rx_csum(struct net_device *dev, u32 data)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         if (data)
                 sp->rx_csum = 1;
@@ -6602,7 +6602,7 @@ static int s2io_get_eeprom_len(struct net_device *dev)
 
 static int s2io_get_sset_count(struct net_device *dev, int sset)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         switch (sset) {
         case ETH_SS_TEST:
@@ -6625,7 +6625,7 @@ static void s2io_ethtool_get_strings(struct net_device *dev,
                                      u32 stringset, u8 * data)
 {
         int stat_size = 0;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         switch (stringset) {
         case ETH_SS_TEST:
@@ -6727,7 +6727,7 @@ static int s2io_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
 static int s2io_change_mtu(struct net_device *dev, int new_mtu)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
         int ret = 0;
 
         if ((new_mtu < MIN_MTU) || (new_mtu > S2IO_JUMBO_SIZE)) {
@@ -7331,7 +7331,7 @@ out_unlock:
 
 static void s2io_tx_watchdog(struct net_device *dev)
 {
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         if (netif_carrier_ok(dev)) {
                 sp->mac_control.stats_info->sw_stat.watchdog_timer_cnt++;
@@ -7796,7 +7796,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         /*  Private member variable initialized to s2io NIC structure */
-        sp = dev->priv;
+        sp = netdev_priv(dev);
         memset(sp, 0, sizeof(struct s2io_nic));
         sp->dev = dev;
         sp->pdev = pdev;
@@ -8250,7 +8250,7 @@ static void __devexit s2io_rem_nic(struct pci_dev *pdev)
 
         flush_scheduled_work();
 
-        sp = dev->priv;
+        sp = netdev_priv(dev);
         unregister_netdev(dev);
 
         free_shared_mem(sp);
@@ -8585,7 +8585,7 @@ static void clear_lro_session(struct lro *lro)
 static void queue_rx_frame(struct sk_buff *skb, u16 vlan_tag)
 {
         struct net_device *dev = skb->dev;
-        struct s2io_nic *sp = dev->priv;
+        struct s2io_nic *sp = netdev_priv(dev);
 
         skb->protocol = eth_type_trans(skb, dev);
         if (sp->vlgrp && vlan_tag
@@ -8634,7 +8634,7 @@ static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev,
                                                pci_channel_state_t state)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
-        struct s2io_nic *sp = netdev->priv;
+        struct s2io_nic *sp = netdev_priv(netdev);
 
         netif_device_detach(netdev);
 
@@ -8659,7 +8659,7 @@ static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev,
 static pci_ers_result_t s2io_io_slot_reset(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
-        struct s2io_nic *sp = netdev->priv;
+        struct s2io_nic *sp = netdev_priv(netdev);
 
         if (pci_enable_device(pdev)) {
                 printk(KERN_ERR "s2io: "
@@ -8683,7 +8683,7 @@ static pci_ers_result_t s2io_io_slot_reset(struct pci_dev *pdev)
 static void s2io_io_resume(struct pci_dev *pdev)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
-        struct s2io_nic *sp = netdev->priv;
+        struct s2io_nic *sp = netdev_priv(netdev);
 
         if (netif_running(netdev)) {
                 if (s2io_card_up(sp)) {