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>
This commit is contained in:
Wang Chen
committed by
David S. Miller
David S. Miller
parent
454d7c9b14
commit
4cf1653aa9
@@ -600,7 +600,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
lp = (struct depca_private *) dev->priv;
|
||||
lp = netdev_priv(dev);
|
||||
mem_start = lp->mem_start;
|
||||
|
||||
if (!mem_start || lp->adapter < DEPCA || lp->adapter >=unknown)
|
||||
@@ -820,7 +820,7 @@ out_priv:
|
||||
|
||||
static int depca_open(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
u_long ioaddr = dev->base_addr;
|
||||
s16 nicsr;
|
||||
int status = 0;
|
||||
@@ -865,7 +865,7 @@ static int depca_open(struct net_device *dev)
|
||||
/* Initialize the lance Rx and Tx descriptor rings. */
|
||||
static void depca_init_ring(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
u_int i;
|
||||
u_long offset;
|
||||
|
||||
@@ -923,7 +923,7 @@ static void depca_tx_timeout(struct net_device *dev)
|
||||
*/
|
||||
static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
u_long ioaddr = dev->base_addr;
|
||||
int status = 0;
|
||||
|
||||
@@ -971,7 +971,7 @@ static irqreturn_t depca_interrupt(int irq, void *dev_id)
|
||||
return IRQ_NONE;
|
||||
}
|
||||
|
||||
lp = (struct depca_private *) dev->priv;
|
||||
lp = netdev_priv(dev);
|
||||
ioaddr = dev->base_addr;
|
||||
|
||||
spin_lock(&lp->lock);
|
||||
@@ -1009,7 +1009,7 @@ static irqreturn_t depca_interrupt(int irq, void *dev_id)
|
||||
/* Called with lp->lock held */
|
||||
static int depca_rx(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
int i, entry;
|
||||
s32 status;
|
||||
|
||||
@@ -1106,7 +1106,7 @@ static int depca_rx(struct net_device *dev)
|
||||
*/
|
||||
static int depca_tx(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
int entry;
|
||||
s32 status;
|
||||
u_long ioaddr = dev->base_addr;
|
||||
@@ -1147,7 +1147,7 @@ static int depca_tx(struct net_device *dev)
|
||||
|
||||
static int depca_close(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
s16 nicsr;
|
||||
u_long ioaddr = dev->base_addr;
|
||||
|
||||
@@ -1183,7 +1183,7 @@ static int depca_close(struct net_device *dev)
|
||||
|
||||
static void LoadCSRs(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
u_long ioaddr = dev->base_addr;
|
||||
|
||||
outw(CSR1, DEPCA_ADDR); /* initialisation block address LSW */
|
||||
@@ -1200,7 +1200,7 @@ static void LoadCSRs(struct net_device *dev)
|
||||
|
||||
static int InitRestartDepca(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
u_long ioaddr = dev->base_addr;
|
||||
int i, status = 0;
|
||||
|
||||
@@ -1232,7 +1232,7 @@ static int InitRestartDepca(struct net_device *dev)
|
||||
*/
|
||||
static void set_multicast_list(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
u_long ioaddr = dev->base_addr;
|
||||
|
||||
netif_stop_queue(dev);
|
||||
@@ -1261,7 +1261,7 @@ static void set_multicast_list(struct net_device *dev)
|
||||
*/
|
||||
static void SetMulticastFilter(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
struct dev_mc_list *dmi = dev->mc_list;
|
||||
char *addrs;
|
||||
int i, j, bit, byte;
|
||||
@@ -1429,7 +1429,7 @@ static int __init depca_mca_probe(struct device *device)
|
||||
|
||||
dev->irq = irq;
|
||||
dev->base_addr = iobase;
|
||||
lp = dev->priv;
|
||||
lp = netdev_priv(dev);
|
||||
lp->depca_bus = DEPCA_BUS_MCA;
|
||||
lp->adapter = depca_mca_adapter_type[mdev->index];
|
||||
lp->mem_start = mem_start;
|
||||
@@ -1532,7 +1532,7 @@ static int __init depca_isa_probe (struct platform_device *device)
|
||||
dev->base_addr = ioaddr;
|
||||
dev->irq = irq; /* Use whatever value the user gave
|
||||
* us, and 0 if he didn't. */
|
||||
lp = dev->priv;
|
||||
lp = netdev_priv(dev);
|
||||
lp->depca_bus = DEPCA_BUS_ISA;
|
||||
lp->adapter = adapter;
|
||||
lp->mem_start = mem_start;
|
||||
@@ -1578,7 +1578,7 @@ static int __init depca_eisa_probe (struct device *device)
|
||||
|
||||
dev->base_addr = ioaddr;
|
||||
dev->irq = irq;
|
||||
lp = dev->priv;
|
||||
lp = netdev_priv(dev);
|
||||
lp->depca_bus = DEPCA_BUS_EISA;
|
||||
lp->adapter = edev->id.driver_data;
|
||||
lp->mem_start = mem_start;
|
||||
@@ -1603,7 +1603,7 @@ static int __devexit depca_device_remove (struct device *device)
|
||||
int bus;
|
||||
|
||||
dev = device->driver_data;
|
||||
lp = dev->priv;
|
||||
lp = netdev_priv(dev);
|
||||
|
||||
unregister_netdev (dev);
|
||||
iounmap (lp->sh_mem);
|
||||
@@ -1745,7 +1745,7 @@ static int __init DevicePresent(u_long ioaddr)
|
||||
static int __init get_hw_addr(struct net_device *dev)
|
||||
{
|
||||
u_long ioaddr = dev->base_addr;
|
||||
struct depca_private *lp = dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
int i, k, tmp, status = 0;
|
||||
u_short j, x, chksum;
|
||||
|
||||
@@ -1780,7 +1780,7 @@ static int __init get_hw_addr(struct net_device *dev)
|
||||
*/
|
||||
static int load_packet(struct net_device *dev, struct sk_buff *skb)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
int i, entry, end, len, status = 0;
|
||||
|
||||
entry = lp->tx_new; /* Ring around buffer number. */
|
||||
@@ -1835,7 +1835,7 @@ static int load_packet(struct net_device *dev, struct sk_buff *skb)
|
||||
|
||||
static void depca_dbg_open(struct net_device *dev)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
u_long ioaddr = dev->base_addr;
|
||||
struct depca_init *p = &lp->init_block;
|
||||
int i;
|
||||
@@ -1906,7 +1906,7 @@ static void depca_dbg_open(struct net_device *dev)
|
||||
*/
|
||||
static int depca_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
|
||||
{
|
||||
struct depca_private *lp = (struct depca_private *) dev->priv;
|
||||
struct depca_private *lp = netdev_priv(dev);
|
||||
struct depca_ioctl *ioc = (struct depca_ioctl *) &rq->ifr_ifru;
|
||||
int i, status = 0;
|
||||
u_long ioaddr = dev->base_addr;
|
||||
|
||||
Reference in New Issue
Block a user