dev->priv to netdev_priv(dev), drivers/net/tokenring/

[linux-2.6-omap-h63xx.git] / drivers / net / tokenring / ibmtr.c

diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 36202e94ee916330bb8a8ee32e712f70e2f897cb..51409698fe25a0930aa0d8af96c35c4d6c8eb976 100644 (file)
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -327,7 +327,7 @@ static void ibmtr_cleanup_card(struct net_device *dev)
        release_region(dev->base_addr, IBMTR_IO_EXTENT);
 
        { 
-               struct tok_info *ti = (struct tok_info *) dev->priv;
+               struct tok_info *ti = netdev_priv(dev);
                iounmap(ti->mmio);
                iounmap(ti->sram_virt);
        }
@@ -346,7 +346,7 @@ static void ibmtr_cleanup_card(struct net_device *dev)
  *     which references it.
  ****************************************************************************/
 
-static int __init ibmtr_probe(struct net_device *dev)
+static int __devinit ibmtr_probe(struct net_device *dev)
 {
        int i;
        int base_addr = dev->base_addr;
@@ -366,7 +366,7 @@ static int __init ibmtr_probe(struct net_device *dev)
        return -ENODEV;
 }
 
-int __init ibmtr_probe_card(struct net_device *dev)
+int __devinit ibmtr_probe_card(struct net_device *dev)
 {
        int err = ibmtr_probe(dev);
        if (!err) {
@@ -384,7 +384,7 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
 
        unsigned char segment, intr=0, irq=0, i, j, cardpresent=NOTOK, temp=0;
        void __iomem * t_mmio = NULL;
-       struct tok_info *ti = dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
        void __iomem *cd_chanid;
        unsigned char *tchanid, ctemp;
 #ifndef PCMCIA
@@ -823,7 +823,7 @@ static unsigned char __devinit get_sram_size(struct tok_info *adapt_info)
 
 static int __devinit trdev_init(struct net_device *dev)
 {
-       struct tok_info *ti = (struct tok_info *) dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
 
        SET_PAGE(ti->srb_page);
         ti->open_failure = NO    ;
@@ -846,7 +846,7 @@ static int tok_init_card(struct net_device *dev)
        unsigned long i;
 
        PIOaddr = dev->base_addr;
-       ti = (struct tok_info *) dev->priv;
+       ti = netdev_priv(dev);
        /* Special processing for first interrupt after reset */
        ti->do_tok_int = FIRST_INT;
        /* Reset adapter */
@@ -868,7 +868,7 @@ static int tok_init_card(struct net_device *dev)
 /*****************************************************************************/
 static int tok_open(struct net_device *dev)
 {
-       struct tok_info *ti = (struct tok_info *) dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
        int i;
 
        /*the case we were left in a failure state during a previous open */
@@ -927,7 +927,7 @@ static void tok_open_adapter(unsigned long dev_addr)
        struct tok_info *ti;
        int i;
 
-       ti = (struct tok_info *) dev->priv;
+       ti = netdev_priv(dev);
        SET_PAGE(ti->init_srb_page); 
        writeb(~SRB_RESP_INT, ti->mmio + ACA_OFFSET + ACA_RESET + ISRP_ODD);
        for (i = 0; i < sizeof(struct dir_open_adapter); i++)
@@ -962,7 +962,7 @@ static void tok_open_adapter(unsigned long dev_addr)
 static void open_sap(unsigned char type, struct net_device *dev)
 {
        int i;
-       struct tok_info *ti = (struct tok_info *) dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
 
        SET_PAGE(ti->srb_page);
        for (i = 0; i < sizeof(struct dlc_open_sap); i++)
@@ -986,7 +986,7 @@ static void open_sap(unsigned char type, struct net_device *dev)
 
 static void tok_set_multicast_list(struct net_device *dev)
 {
-       struct tok_info *ti = (struct tok_info *) dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
        struct dev_mc_list *mclist;
        unsigned char address[4];
 
@@ -1029,7 +1029,7 @@ static int tok_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
        struct tok_info *ti;
        unsigned long flags;
-       ti = (struct tok_info *) dev->priv;
+       ti = netdev_priv(dev);
 
         netif_stop_queue(dev);
 
@@ -1051,7 +1051,7 @@ static int tok_send_packet(struct sk_buff *skb, struct net_device *dev)
 
 static int tok_close(struct net_device *dev)
 {
-       struct tok_info *ti = (struct tok_info *) dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
 
        /* Important for PCMCIA hot unplug, otherwise, we'll pull the card, */
        /* unloading the module from memory, and then if a timer pops, ouch */
@@ -1094,7 +1094,7 @@ static void __iomem *map_address(struct tok_info *ti, unsigned index, __u8 *page
 
 static void dir_open_adapter (struct net_device *dev)
 {
-        struct tok_info *ti = (struct tok_info *) dev->priv;
+        struct tok_info *ti = netdev_priv(dev);
         unsigned char ret_code;
         __u16 err;
 
@@ -1179,7 +1179,7 @@ static irqreturn_t tok_interrupt(int irq, void *dev_id)
 #if TR_VERBOSE
        DPRINTK("Int from tok_driver, dev : %p irq%d\n", dev,irq);
 #endif
-       ti = (struct tok_info *) dev->priv;
+       ti = netdev_priv(dev);
        if (ti->sram_phys & 1)
                return IRQ_NONE;         /* PCMCIA card extraction flag */
        spin_lock(&(ti->lock));
@@ -1498,7 +1498,7 @@ static void initial_tok_int(struct net_device *dev)
        struct tok_info *ti;
         unsigned char init_status; /*BMS 12/2000*/
 
-       ti = (struct tok_info *) dev->priv;
+       ti = netdev_priv(dev);
 
        ti->do_tok_int = NOT_FIRST;
 
@@ -1560,7 +1560,7 @@ static void initial_tok_int(struct net_device *dev)
 
 static void tr_tx(struct net_device *dev)
 {
-       struct tok_info *ti = (struct tok_info *) dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
        struct trh_hdr *trhdr = (struct trh_hdr *) ti->current_skb->data;
        unsigned int hdr_len;
        __u32 dhb=0,dhb_base;
@@ -1674,7 +1674,7 @@ static void tr_tx(struct net_device *dev)
 
 static void tr_rx(struct net_device *dev)
 {
-       struct tok_info *ti = (struct tok_info *) dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
        __u32 rbuffer;
        void __iomem *rbuf, *rbufdata, *llc;
        __u8 rbuffer_page = 0;
@@ -1771,7 +1771,6 @@ static void tr_rx(struct net_device *dev)
        /*BMS again, if she comes in with few but leaves with many */
        skb_reserve(skb, sizeof(struct trh_hdr) - lan_hdr_len);
        skb_put(skb, length);
-       skb->dev = dev;
        data = skb->data;
        rbuffer_len = ntohs(readw(rbuf + offsetof(struct rec_buf, buf_len)));
        rbufdata = rbuf + offsetof(struct rec_buf, data);
@@ -1847,7 +1846,7 @@ static void ibmtr_reset_timer(struct timer_list *tmr, struct net_device *dev)
 void tok_rerun(unsigned long dev_addr){
 
        struct net_device *dev = (struct net_device *)dev_addr;
-       struct tok_info *ti = (struct tok_info *) dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
 
        if ( ti->open_action == RESTART){
                ti->do_tok_int = FIRST_INT;
@@ -1869,7 +1868,7 @@ static void ibmtr_readlog(struct net_device *dev)
 {
        struct tok_info *ti;
 
-       ti = (struct tok_info *) dev->priv;
+       ti = netdev_priv(dev);
 
        ti->readlog_pending = 0;
        SET_PAGE(ti->srb_page);
@@ -1892,7 +1891,7 @@ static struct net_device_stats *tok_get_stats(struct net_device *dev)
 {
 
        struct tok_info *toki;
-       toki = (struct tok_info *) dev->priv;
+       toki = netdev_priv(dev);
        return (struct net_device_stats *) &toki->tr_stats;
 }
 
@@ -1900,7 +1899,7 @@ static struct net_device_stats *tok_get_stats(struct net_device *dev)
 
 static int ibmtr_change_mtu(struct net_device *dev, int mtu)
 {
-       struct tok_info *ti = (struct tok_info *) dev->priv;
+       struct tok_info *ti = netdev_priv(dev);
 
        if (ti->ring_speed == 16 && mtu > ti->maxmtu16)
                return -EINVAL;