Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b74ca3a896b9ab5f952bc440154758e708c48884

Authored by Wang Chen
Committed by David S. Miller
1 parent 5a001a070e
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

netdevice: Kill netdev->priv 

This is the last shoot of this series.
After I removing all directly reference of netdev->priv, I am killing
"priv" of "struct net_device" and fixing relative comments/docs.

Anyone will not be allowed to reference netdev->priv directly.
If you want to reference the memory of private data, use netdev_priv()
instead.
If the private data is not allocted when alloc_netdev(), use
netdev->ml_priv to point that memory after you creating that private
data.

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

Showing 18 changed files with 24 additions and 29 deletions Side-by-side Diff

Documentation/networking/driver.txt
Diff comments   View file @ b74ca3a
... ... @@ -13,7 +13,7 @@
13 13 static int drv_hard_start_xmit(struct sk_buff *skb,
14 14 struct net_device *dev)
15 15 {
16   - struct drv *dp = dev->priv;
  16 + struct drv *dp = netdev_priv(dev);
17 17  
18 18 lock_tx(dp);
19 19 ...
Documentation/networking/netdevices.txt
Diff comments   View file @ b74ca3a
... ... @@ -18,7 +18,7 @@
18 18 alloc_etherdev, alloc_netdev. These reserve extra space for driver
19 19 private data which gets freed when the network device is freed. If
20 20 separately allocated data is attached to the network device
21   -(dev->priv) then it is up to the module exit handler to free that.
  21 +(netdev_priv(dev)) then it is up to the module exit handler to free that.
22 22  
23 23 MTU
24 24 ===
... ... @@ -23,7 +23,7 @@
23 23 static int el_debug = EL_DEBUG;
24 24  
25 25 /*
26   - * Board-specific info in dev->priv.
  26 + * Board-specific info in netdev_priv(dev).
27 27 */
28 28  
29 29 struct net_local
... ... @@ -420,7 +420,7 @@
420 420 registers that "should" only need to be set once at boot, so that
421 421 there is non-reboot way to recover if something goes wrong.
422 422  
423   - This is an attachable device: if there is no dev->priv entry then it wasn't
  423 + This is an attachable device: if there is no private entry then it wasn't
424 424 probed for at boot-time, and we need to probe for it again.
425 425 */
426 426 static int net_open(struct net_device *dev)
drivers/net/eexpress.c
Diff comments   View file @ b74ca3a
... ... @@ -1046,7 +1046,7 @@
1046 1046 /*
1047 1047 * Sanity check the suspected EtherExpress card
1048 1048 * Read hardware address, reset card, size memory and initialize buffer
1049   - * memory pointers. These are held in dev->priv, in case someone has more
  1049 + * memory pointers. These are held in netdev_priv(), in case someone has more
1050 1050 * than one card in a machine.
1051 1051 */
1052 1052  
drivers/net/forcedeth.c
Diff comments   View file @ b74ca3a
... ... @@ -712,12 +712,12 @@
712 712  
713 713 /*
714 714 * SMP locking:
715   - * All hardware access under dev->priv->lock, except the performance
  715 + * All hardware access under netdev_priv(dev)->lock, except the performance
716 716 * critical parts:
717 717 * - rx is (pseudo-) lockless: it relies on the single-threading provided
718 718 * by the arch code for interrupts.
719 719 * - tx setup is lockless: it relies on netif_tx_lock. Actual submission
720   - * needs dev->priv->lock :-(
  720 + * needs netdev_priv(dev)->lock :-(
721 721 * - set_multicast_list: preparation lockless, relies on netif_tx_lock.
722 722 */
723 723  
... ... @@ -519,7 +519,7 @@
519 519 }
520 520 }
521 521  
522   - /* We can't allocate dev->priv from alloc_etherdev() because it must
  522 + /* We can't allocate private data from alloc_etherdev() because it must
523 523 a ISA DMA-able region. */
524 524 chipname = chip_table[lance_version].name;
525 525 printk("%s: %s at %#3x, ", dev->name, chipname, ioaddr);
drivers/net/myri_sbus.c
Diff comments   View file @ b74ca3a
... ... @@ -1091,7 +1091,7 @@
1091 1091 err_free_irq:
1092 1092 free_irq(dev->irq, dev);
1093 1093 err:
1094   - /* This will also free the co-allocated 'dev->priv' */
  1094 + /* This will also free the co-allocated private data*/
1095 1095 free_netdev(dev);
1096 1096 return -ENODEV;
1097 1097 }
drivers/net/pci-skeleton.c
Diff comments   View file @ b74ca3a
... ... @@ -781,7 +781,7 @@
781 781 dev->irq = pdev->irq;
782 782 dev->base_addr = (unsigned long) ioaddr;
783 783  
784   - /* dev->priv/tp zeroed and aligned in alloc_etherdev */
  784 + /* netdev_priv()/tp zeroed and aligned in alloc_etherdev */
785 785 tp = netdev_priv(dev);
786 786  
787 787 /* note: tp->chipset set in netdrv_init_board */
drivers/net/sun3_82586.c
Diff comments   View file @ b74ca3a
... ... @@ -209,7 +209,7 @@
209 209 static int check586(struct net_device *dev,char *where,unsigned size)
210 210 {
211 211 struct priv pb;
212   - struct priv *p = /* (struct priv *) dev->priv*/ &pb;
  212 + struct priv *p = &pb;
213 213 char *iscp_addr;
214 214 int i;
215 215  
drivers/net/sunbmac.c
Diff comments   View file @ b74ca3a
... ... @@ -1233,7 +1233,7 @@
1233 1233 bp->bmac_block,
1234 1234 bp->bblock_dvma);
1235 1235  
1236   - /* This also frees the co-located 'dev->priv' */
  1236 + /* This also frees the co-located private data */
1237 1237 free_netdev(dev);
1238 1238 return -ENODEV;
1239 1239 }
drivers/net/tokenring/3c359.c
Diff comments   View file @ b74ca3a
... ... @@ -296,8 +296,9 @@
296 296 } ;
297 297  
298 298 /*
299   - * Allowing init_trdev to allocate the dev->priv structure will align xl_private
300   - * on a 32 bytes boundary which we need for the rx/tx descriptors
  299 + * Allowing init_trdev to allocate the private data will align
  300 + * xl_private on a 32 bytes boundary which we need for the rx/tx
  301 + * descriptors
301 302 */
302 303  
303 304 dev = alloc_trdev(sizeof(struct xl_private)) ;
drivers/net/via-rhine.c
Diff comments   View file @ b74ca3a
... ... @@ -191,12 +191,13 @@
191 191  
192 192 The driver runs as two independent, single-threaded flows of control. One
193 193 is the send-packet routine, which enforces single-threaded use by the
194   -dev->priv->lock spinlock. The other thread is the interrupt handler, which
195   -is single threaded by the hardware and interrupt handling software.
  194 +netdev_priv(dev)->lock spinlock. The other thread is the interrupt handler,
  195 +which is single threaded by the hardware and interrupt handling software.
196 196  
197 197 The send packet thread has partial control over the Tx ring. It locks the
198   -dev->priv->lock whenever it's queuing a Tx packet. If the next slot in the ring
199   -is not available it stops the transmit queue by calling netif_stop_queue.
  198 +netdev_priv(dev)->lock whenever it's queuing a Tx packet. If the next slot in
  199 +the ring is not available it stops the transmit queue by
  200 +calling netif_stop_queue.
200 201  
201 202 The interrupt handler has exclusive control over the Rx ring and records stats
202 203 from the Tx ring. After reaping the stats, it marks the Tx queue entry as
drivers/net/wireless/strip.c
Diff comments   View file @ b74ca3a
... ... @@ -2494,7 +2494,7 @@
2494 2494 dev->type = ARPHRD_METRICOM; /* dtang */
2495 2495 dev->hard_header_len = sizeof(STRIP_Header);
2496 2496 /*
2497   - * dev->priv Already holds a pointer to our struct strip
  2497 + * netdev_priv(dev) Already holds a pointer to our struct strip
2498 2498 */
2499 2499  
2500 2500 *(MetricomAddress *) & dev->broadcast = broadcast_address;
include/linux/hdlc.h
Diff comments   View file @ b74ca3a
... ... @@ -43,7 +43,7 @@
43 43 };
44 44  
45 45  
46   -/* Pointed to by dev->priv */
  46 +/* Pointed to by netdev_priv(dev) */
47 47 typedef struct hdlc_device {
48 48 /* used by HDLC layer to take control over HDLC device from hw driver*/
49 49 int (*attach)(struct net_device *dev,
include/linux/netdevice.h
Diff comments   View file @ b74ca3a
... ... @@ -785,7 +785,6 @@
785 785 /*
786 786 * One part is mostly used on xmit path (device)
787 787 */
788   - void *priv; /* pointer to private data */
789 788 /* These may be needed for future network-power-down code. */
790 789 unsigned long trans_start; /* Time (in jiffies) of last Tx */
791 790  
... ... @@ -341,8 +341,8 @@
341 341 }
342 342  
343 343 /*
344   - * lec device calls this via its dev->priv->lane2_ops->associate_indicator()
345   - * when it sees a TLV in LE_ARP packet.
  344 + * lec device calls this via its netdev_priv(dev)->lane2_ops
  345 + * ->associate_indicator() when it sees a TLV in LE_ARP packet.
346 346 * We fill in the pointer above when we see a LANE2 lec initializing
347 347 * See LANE2 spec 3.1.5
348 348 *
... ... @@ -4378,12 +4378,6 @@
4378 4378 dev->num_tx_queues = queue_count;
4379 4379 dev->real_num_tx_queues = queue_count;
4380 4380  
4381   - if (sizeof_priv) {
4382   - dev->priv = ((char *)dev +
4383   - ((sizeof(struct net_device) + NETDEV_ALIGN_CONST)
4384   - & ~NETDEV_ALIGN_CONST));
4385   - }
4386   -
4387 4381 dev->gso_max_size = GSO_MAX_SIZE;
4388 4382  
4389 4383 netdev_init_queues(dev);