net: delete excess kernel-doc notation

[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 1e8958ee2d0ab5905897c088d493f077ed732886..e494c63bfbd9643088c0c30680fdc956becf8b60 100644 (file)
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -116,9 +116,6 @@ in the event that chatty debug messages are desired - jjs 12/30/98 */
 #define ENABLE_PAGING 1                
 #endif
 
-#define FALSE 0
-#define TRUE (!FALSE)
-
 /* changes the output format of driver initialization */
 #define TR_VERBOSE     0
 
@@ -327,7 +324,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);
        }
@@ -384,7 +381,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
@@ -392,6 +389,7 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
         unsigned long timeout;
        static int version_printed;
 #endif
+       DECLARE_MAC_BUF(mac);
 
        /*    Query the adapter PIO base port which will return
         *    indication of where MMIO was placed. We also have a
@@ -705,9 +703,8 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
                channel_def[cardpresent - 1], adapter_def(ti->adapter_type));
        DPRINTK("using irq %d, PIOaddr %hx, %dK shared RAM.\n",
                        irq, PIOaddr, ti->mapped_ram_size / 2);
-       DPRINTK("Hardware address : %02X:%02X:%02X:%02X:%02X:%02X\n",
-               dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
-               dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+       DPRINTK("Hardware address : %s\n",
+               print_mac(mac, dev->dev_addr));
        if (ti->page_mask)
                DPRINTK("Shared RAM paging enabled. "
                        "Page size: %uK Shared Ram size %dK\n",
@@ -823,7 +820,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 +843,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 +865,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 +924,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 +959,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 +983,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 +1026,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 +1048,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 +1091,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 +1176,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 +1495,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;
 
@@ -1542,7 +1539,7 @@ static void initial_tok_int(struct net_device *dev)
        ti->ring_speed = init_status & 0x01 ? 16 : 4;
        DPRINTK("Initial interrupt : %d Mbps, shared RAM base %08x.\n",
                                ti->ring_speed, (unsigned int)dev->mem_start);
-       ti->auto_speedsave=readb(ti->init_srb+INIT_STATUS_2_OFST)&4?TRUE:FALSE;
+       ti->auto_speedsave = (readb(ti->init_srb+INIT_STATUS_2_OFST) & 4) != 0;
 
         if (ti->open_mode == MANUAL)   wake_up(&ti->wait_for_reset);
        else                            tok_open_adapter((unsigned long)dev);
@@ -1560,7 +1557,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 +1671,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;
@@ -1742,18 +1739,20 @@ static void tr_rx(struct net_device *dev)
        if (!IPv4_p) {
 
                void __iomem *trhhdr = rbuf + offsetof(struct rec_buf, data);
-
+               u8 saddr[6];
+               u8 daddr[6];
+               DECLARE_MAC_BUF(mac);
+               DECLARE_MAC_BUF(mac2);
+               int i;
+               for (i = 0 ; i < 6 ; i++)
+                       saddr[i] = readb(trhhdr + SADDR_OFST + i);
+               for (i = 0 ; i < 6 ; i++)
+                       daddr[i] = readb(trhhdr + DADDR_OFST + i);
                DPRINTK("Probably non-IP frame received.\n");
                DPRINTK("ssap: %02X dsap: %02X "
-                       "saddr: %02X:%02X:%02X:%02X:%02X:%02X "
-                       "daddr: %02X:%02X:%02X:%02X:%02X:%02X\n",
+                       "saddr: %s daddr: %$s\n",
                        readb(llc + SSAP_OFST), readb(llc + DSAP_OFST),
-                       readb(trhhdr+SADDR_OFST), readb(trhhdr+ SADDR_OFST+1),
-                       readb(trhhdr+SADDR_OFST+2), readb(trhhdr+SADDR_OFST+3),
-                       readb(trhhdr+SADDR_OFST+4), readb(trhhdr+SADDR_OFST+5),
-                       readb(trhhdr+DADDR_OFST), readb(trhhdr+DADDR_OFST + 1),
-                       readb(trhhdr+DADDR_OFST+2), readb(trhhdr+DADDR_OFST+3),
-                       readb(trhhdr+DADDR_OFST+4), readb(trhhdr+DADDR_OFST+5));
+                       print_mac(mac, saddr), print_mac(mac2, daddr));
        }
 #endif
 
@@ -1846,7 +1845,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;
@@ -1868,7 +1867,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);
@@ -1891,7 +1890,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;
 }
 
@@ -1899,7 +1898,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;