Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390_net: Kill directly reference of netdev->priv

The private data comes from ccwgroup_device.
So just don't allocate private data memory when do alloc_netdev()
and use netdev->ml_priv to reference private data.

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

authored by

Wang Chen and committed by
David S. Miller
ad660e2f 26aca5ec

+6 -6
+6 -6
drivers/s390/net/lcs.c
··· 1290 1290 struct lcs_card *card; 1291 1291 1292 1292 LCS_DBF_TEXT(4, trace, "setmulti"); 1293 - card = (struct lcs_card *) dev->priv; 1293 + card = (struct lcs_card *) dev->ml_priv; 1294 1294 1295 1295 if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) 1296 1296 schedule_work(&card->kernel_thread_starter); ··· 1607 1607 int rc; 1608 1608 1609 1609 LCS_DBF_TEXT(5, trace, "pktxmit"); 1610 - card = (struct lcs_card *) dev->priv; 1610 + card = (struct lcs_card *) dev->ml_priv; 1611 1611 rc = __lcs_start_xmit(card, skb, dev); 1612 1612 return rc; 1613 1613 } ··· 1863 1863 struct lcs_card *card; 1864 1864 1865 1865 LCS_DBF_TEXT(4, trace, "netstats"); 1866 - card = (struct lcs_card *) dev->priv; 1866 + card = (struct lcs_card *) dev->ml_priv; 1867 1867 return &card->stats; 1868 1868 } 1869 1869 ··· 1878 1878 int rc; 1879 1879 1880 1880 LCS_DBF_TEXT(2, trace, "stopdev"); 1881 - card = (struct lcs_card *) dev->priv; 1881 + card = (struct lcs_card *) dev->ml_priv; 1882 1882 netif_carrier_off(dev); 1883 1883 netif_tx_disable(dev); 1884 1884 dev->flags &= ~IFF_UP; ··· 1901 1901 int rc; 1902 1902 1903 1903 LCS_DBF_TEXT(2, trace, "opendev"); 1904 - card = (struct lcs_card *) dev->priv; 1904 + card = (struct lcs_card *) dev->ml_priv; 1905 1905 /* initialize statistics */ 1906 1906 rc = lcs_detect(card); 1907 1907 if (rc) { ··· 2150 2150 if (!dev) 2151 2151 goto out; 2152 2152 card->dev = dev; 2153 - card->dev->priv = card; 2153 + card->dev->ml_priv = card; 2154 2154 card->dev->open = lcs_open_device; 2155 2155 card->dev->stop = lcs_stop_device; 2156 2156 card->dev->hard_start_xmit = lcs_start_xmit;