From: Dmitry Torokhov IRDA: smsc-ircc2 - use netdev_priv() instead of accessing pointer directly. Signed-off-by: Dmitry Torokhov Cc: Jean Tourrilhes Signed-off-by: Andrew Morton --- drivers/net/irda/smsc-ircc2.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff -puN drivers/net/irda/smsc-ircc2.c~smsc-ircc2-use-netdev_priv drivers/net/irda/smsc-ircc2.c --- 25/drivers/net/irda/smsc-ircc2.c~smsc-ircc2-use-netdev_priv 2005-06-24 23:45:23.000000000 -0700 +++ 25-akpm/drivers/net/irda/smsc-ircc2.c 2005-06-24 23:45:23.000000000 -0700 @@ -426,7 +426,7 @@ static int __init smsc_ircc_open(unsigne dev->do_ioctl = smsc_ircc_net_ioctl; dev->get_stats = smsc_ircc_net_get_stats; - self = dev->priv; + self = netdev_priv(dev); self->netdev = dev; /* Make ifconfig display some details */ @@ -693,7 +693,7 @@ static int smsc_ircc_net_ioctl(struct ne IRDA_ASSERT(dev != NULL, return -1;); - self = dev->priv; + self = netdev_priv(dev); IRDA_ASSERT(self != NULL, return -1;); @@ -740,7 +740,7 @@ static int smsc_ircc_net_ioctl(struct ne static struct net_device_stats *smsc_ircc_net_get_stats(struct net_device *dev) { - struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) dev->priv; + struct smsc_ircc_cb *self = netdev_priv(dev); return &self->stats; } @@ -755,11 +755,9 @@ static struct net_device_stats *smsc_irc static void smsc_ircc_timeout(struct net_device *dev) { - struct smsc_ircc_cb *self; + struct smsc_ircc_cb *self = netdev_priv(dev); unsigned long flags; - self = (struct smsc_ircc_cb *) dev->priv; - IRDA_WARNING("%s: transmit timed out, changing speed to: %d\n", dev->name, self->io.speed); spin_lock_irqsave(&self->lock, flags); @@ -788,7 +786,7 @@ int smsc_ircc_hard_xmit_sir(struct sk_bu IRDA_ASSERT(dev != NULL, return 0;); - self = (struct smsc_ircc_cb *) dev->priv; + self = netdev_priv(dev); IRDA_ASSERT(self != NULL, return 0;); netif_stop_queue(dev); @@ -1096,7 +1094,7 @@ static int smsc_ircc_hard_xmit_fir(struc int mtt; IRDA_ASSERT(dev != NULL, return 0;); - self = (struct smsc_ircc_cb *) dev->priv; + self = netdev_priv(dev); IRDA_ASSERT(self != NULL, return 0;); netif_stop_queue(dev); @@ -1427,7 +1425,8 @@ static irqreturn_t smsc_ircc_interrupt(i driver_name, irq); goto irq_ret; } - self = (struct smsc_ircc_cb *) dev->priv; + + self = netdev_priv(dev); IRDA_ASSERT(self != NULL, return IRQ_NONE;); /* Serialise the interrupt handler in various CPUs, stop Tx path */ @@ -1485,7 +1484,7 @@ static irqreturn_t smsc_ircc_interrupt(i */ static irqreturn_t smsc_ircc_interrupt_sir(struct net_device *dev) { - struct smsc_ircc_cb *self = dev->priv; + struct smsc_ircc_cb *self = netdev_priv(dev); int boguscount = 0; int iobase; int iir, lsr; @@ -1576,7 +1575,7 @@ static int smsc_ircc_net_open(struct net IRDA_DEBUG(1, "%s\n", __FUNCTION__); IRDA_ASSERT(dev != NULL, return -1;); - self = (struct smsc_ircc_cb *) dev->priv; + self = netdev_priv(dev); IRDA_ASSERT(self != NULL, return 0;); if (self->io.suspended) { @@ -1637,7 +1636,7 @@ static int smsc_ircc_net_close(struct ne IRDA_DEBUG(1, "%s\n", __FUNCTION__); IRDA_ASSERT(dev != NULL, return -1;); - self = (struct smsc_ircc_cb *) dev->priv; + self = netdev_priv(dev); IRDA_ASSERT(self != NULL, return 0;); /* Stop device */ _