10 files changed, 40 insertions, 68 deletions

diff --git a/drivers/net/gt96100eth.h b/drivers/net/gt96100eth.h
index 2f4bfd4dacbe..395869c5ed3e 100644
--- a/drivers/net/gt96100eth.h
+++ b/drivers/net/gt96100eth.h
@@ -214,7 +214,7 @@ typedef struct {
         u32 cmdstat;
         u32 next;
         u32 buff_ptr;
-} gt96100_td_t __attribute__ ((packed));
+} __attribute__ ((packed)) gt96100_td_t;
 
 typedef struct {
 #ifdef DESC_BE
@@ -227,7 +227,7 @@ typedef struct {
         u32 cmdstat;
         u32 next;
         u32 buff_ptr;
-} gt96100_rd_t __attribute__ ((packed));
+} __attribute__ ((packed)) gt96100_rd_t;
 
 
 /* Values for the Tx command-status descriptor entry. */
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index acb170152bbd..b3a898c5a585 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -13,8 +13,8 @@
 ** This driver has only been tested with
 ** -- HP J2585B 10/100 Mbit/s PCI Busmaster
 ** -- HP J2585A 10/100 Mbit/s PCI 
-** -- HP J2970  10 Mbit/s PCI Combo 10base-T/BNC
-** -- HP J2973  10 Mbit/s PCI 10base-T
+** -- HP J2970A 10 Mbit/s PCI Combo 10base-T/BNC
+** -- HP J2973A 10 Mbit/s PCI 10base-T
 ** -- HP J2573  10/100 ISA
 ** -- Compex ReadyLink ENET100-VG4  10/100 Mbit/s PCI / EISA
 ** -- Compex FreedomLine 100/VG  10/100 Mbit/s ISA / EISA / PCI
diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp_deflate.c
index 507d6328d4eb..3872088fdd10 100644
--- a/drivers/net/ppp_deflate.c
+++ b/drivers/net/ppp_deflate.c
@@ -87,8 +87,7 @@ static void z_comp_free(void *arg)
 
         if (state) {
                 zlib_deflateEnd(&state->strm);
-                if (state->strm.workspace)
-                        vfree(state->strm.workspace);
+                vfree(state->strm.workspace);
                 kfree(state);
         }
 }
@@ -308,8 +307,7 @@ static void z_decomp_free(void *arg)
 
         if (state) {
                 zlib_inflateEnd(&state->strm);
-                if (state->strm.workspace)
-                        kfree(state->strm.workspace);
+                kfree(state->strm.workspace);
                 kfree(state);
         }
 }
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index c456dc81b873..3b377f6cd4a0 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -2467,14 +2467,10 @@ static void ppp_destroy_interface(struct ppp *ppp)
         skb_queue_purge(&ppp->mrq);
 #endif /* CONFIG_PPP_MULTILINK */
 #ifdef CONFIG_PPP_FILTER
-        if (ppp->pass_filter) {
-                kfree(ppp->pass_filter);
-                ppp->pass_filter = NULL;
-        }
-        if (ppp->active_filter) {
-                kfree(ppp->active_filter);
-                ppp->active_filter = NULL;
-        }
+        kfree(ppp->pass_filter);
+        ppp->pass_filter = NULL;
+        kfree(ppp->active_filter);
+        ppp->active_filter = NULL;
 #endif /* CONFIG_PPP_FILTER */
 
         kfree(ppp);
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 07e2df09491f..c59507f8a76b 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2385,7 +2385,7 @@ core_down:
         }
 
         /* Give a racing hard_start_xmit a few cycles to complete. */
-        synchronize_kernel();
+        synchronize_sched();  /* FIXME: should this be synchronize_irq()? */
 
         /*
          * And now for the 50k$ question: are IRQ disabled or not ?
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 903d0ced7ddb..058c70c6f1ac 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -5830,7 +5830,7 @@ static int tg3_test_interrupt(struct tg3 *tp)
         free_irq(tp->pdev->irq, dev);
 
         err = request_irq(tp->pdev->irq, tg3_test_isr,
-                          SA_SHIRQ, dev->name, dev);
+                          SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
         if (err)
                 return err;
 
@@ -5852,10 +5852,10 @@ static int tg3_test_interrupt(struct tg3 *tp)
         
         if (tp->tg3_flags2 & TG3_FLG2_USING_MSI)
                 err = request_irq(tp->pdev->irq, tg3_msi,
-                                  0, dev->name, dev);
+                                  SA_SAMPLE_RANDOM, dev->name, dev);
         else
                 err = request_irq(tp->pdev->irq, tg3_interrupt,
-                                  SA_SHIRQ, dev->name, dev);
+                                  SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 
         if (err)
                 return err;
@@ -5908,7 +5908,7 @@ static int tg3_test_msi(struct tg3 *tp)
         tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI;
 
         err = request_irq(tp->pdev->irq, tg3_interrupt,
-                          SA_SHIRQ, dev->name, dev);
+                          SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 
         if (err)
                 return err;
@@ -5965,10 +5965,10 @@ static int tg3_open(struct net_device *dev)
         }
         if (tp->tg3_flags2 & TG3_FLG2_USING_MSI)
                 err = request_irq(tp->pdev->irq, tg3_msi,
-                                  0, dev->name, dev);
+                                  SA_SAMPLE_RANDOM, dev->name, dev);
         else
                 err = request_irq(tp->pdev->irq, tg3_interrupt,
-                                  SA_SHIRQ, dev->name, dev);
+                                  SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 
         if (err) {
                 if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) {
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index 5b48cd8568f5..02d57c0b4243 100644
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -436,9 +436,7 @@ static int cycx_wan_new_if(struct wan_device *wandev, struct net_device *dev,
         }
 
         if (err) {
-                if (chan->local_addr)
-                        kfree(chan->local_addr);
-
+                kfree(chan->local_addr);
                 kfree(chan);
                 return err;
         }
@@ -458,9 +456,7 @@ static int cycx_wan_del_if(struct wan_device *wandev, struct net_device *dev)
                 struct cycx_x25_channel *chan = dev->priv;
 
                 if (chan->svc) {
-                        if (chan->local_addr)
-                                kfree(chan->local_addr);
-
+                        kfree(chan->local_addr);
                         if (chan->state == WAN_CONNECTED)
                                 del_timer(&chan->timer);
                 }
diff --git a/drivers/net/wan/pc300_tty.c b/drivers/net/wan/pc300_tty.c
index 29f84ad08730..8454bf6caaa7 100644
--- a/drivers/net/wan/pc300_tty.c
+++ b/drivers/net/wan/pc300_tty.c
@@ -400,10 +400,8 @@ static void cpc_tty_close(struct tty_struct *tty, struct file *flip)
                 cpc_tty->buf_rx.last = NULL;
         }
         
-        if (cpc_tty->buf_tx) {
-                kfree(cpc_tty->buf_tx);
-                cpc_tty->buf_tx = NULL;
-        }
+        kfree(cpc_tty->buf_tx);
+        cpc_tty->buf_tx = NULL;
 
         CPC_TTY_DBG("%s: TTY closed\n",cpc_tty->name);
         
@@ -666,7 +664,7 @@ static void cpc_tty_rx_work(void * data)
         unsigned long port;
         int i, j;
         st_cpc_tty_area *cpc_tty; 
-        volatile st_cpc_rx_buf * buf;
+        volatile st_cpc_rx_buf *buf;
         char flags=0,flg_rx=1; 
         struct tty_ldisc *ld;
 
@@ -680,9 +678,9 @@ static void cpc_tty_rx_work(void * data)
                         cpc_tty = &cpc_tty_area[port];
                 
                         if ((buf=cpc_tty->buf_rx.first) != 0) {
-                                if(cpc_tty->tty) {
+                                if (cpc_tty->tty) {
                                         ld = tty_ldisc_ref(cpc_tty->tty);
-                                        if(ld) {
+                                        if (ld) {
                                                 if (ld->receive_buf) {
                                                         CPC_TTY_DBG("%s: call line disc. receive_buf\n",cpc_tty->name);
                                                         ld->receive_buf(cpc_tty->tty, (char *)(buf->data), &flags, buf->size);
@@ -691,7 +689,7 @@ static void cpc_tty_rx_work(void * data)
                                         }
                                 }       
                                 cpc_tty->buf_rx.first = cpc_tty->buf_rx.first->next;
-                                kfree((unsigned char *)buf);
+                                kfree(buf);
                                 buf = cpc_tty->buf_rx.first;
                                 flg_rx = 1;
                         }
@@ -733,7 +731,7 @@ static void cpc_tty_rx_disc_frame(pc300ch_t *pc300chan)
 
 void cpc_tty_receive(pc300dev_t *pc300dev)
 {
-        st_cpc_tty_area    *cpc_tty; 
+        st_cpc_tty_area *cpc_tty; 
         pc300ch_t *pc300chan = (pc300ch_t *)pc300dev->chan; 
         pc300_t *card = (pc300_t *)pc300chan->card; 
         int ch = pc300chan->channel; 
@@ -742,7 +740,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
         int rx_len, rx_aux; 
         volatile unsigned char status; 
         unsigned short first_bd = pc300chan->rx_first_bd;
-        st_cpc_rx_buf   *new=NULL;
+        st_cpc_rx_buf *new = NULL;
         unsigned char dsr_rx;
 
         if (pc300dev->cpc_tty == NULL) { 
@@ -762,7 +760,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
                         if (status & DST_EOM) {
                                 break;
                         }
-                        ptdescr=(pcsca_bd_t __iomem *)(card->hw.rambase+cpc_readl(&ptdescr->next));
+                        ptdescr = (pcsca_bd_t __iomem *)(card->hw.rambase+cpc_readl(&ptdescr->next));
                 }
                         
                 if (!rx_len) { 
@@ -771,10 +769,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
                                 cpc_writel(card->hw.scabase + DRX_REG(EDAL, ch), 
                                                 RX_BD_ADDR(ch, pc300chan->rx_last_bd)); 
                         }
-                        if (new) {
-                                kfree(new);
-                                new = NULL;
-                        }
+                        kfree(new);
                         return; 
                 }
                 
@@ -787,7 +782,7 @@ void cpc_tty_receive(pc300dev_t *pc300dev)
                         continue;
                 } 
                 
-                new = (st_cpc_rx_buf *) kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
+                new = (st_cpc_rx_buf *)kmalloc(rx_len + sizeof(st_cpc_rx_buf), GFP_ATOMIC);
                 if (new == 0) {
                         cpc_tty_rx_disc_frame(pc300chan);
                         continue;
diff --git a/drivers/net/wan/sdla_chdlc.c b/drivers/net/wan/sdla_chdlc.c
index afbe0024e3e1..496d29237e92 100644
--- a/drivers/net/wan/sdla_chdlc.c
+++ b/drivers/net/wan/sdla_chdlc.c
@@ -3664,15 +3664,10 @@ static void wanpipe_tty_close(struct tty_struct *tty, struct file * filp)
                 chdlc_disable_comm_shutdown(card);
                 unlock_adapter_irq(&card->wandev.lock,&smp_flags);
 
-                if (card->tty_buf){
-                        kfree(card->tty_buf);
-                        card->tty_buf=NULL;                     
-                }
-
-                if (card->tty_rx){
-                        kfree(card->tty_rx);
-                        card->tty_rx=NULL;
-                }
+                kfree(card->tty_buf);
+                card->tty_buf = NULL;                   
+                kfree(card->tty_rx);
+                card->tty_rx = NULL;
         }
         return;
 }
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 8c5cfcb55826..1c540d825551 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -107,13 +107,9 @@ static struct x25_asy *x25_asy_alloc(void)
 static void x25_asy_free(struct x25_asy *sl)
 {
         /* Free all X.25 frame buffers. */
-        if (sl->rbuff)  {
-                kfree(sl->rbuff);
-        }
+        kfree(sl->rbuff);
         sl->rbuff = NULL;
-        if (sl->xbuff)  {
-                kfree(sl->xbuff);
-        }
+        kfree(sl->xbuff);
         sl->xbuff = NULL;
 
         if (!test_and_clear_bit(SLF_INUSE, &sl->flags)) {
@@ -134,10 +130,8 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
         {
                 printk("%s: unable to grow X.25 buffers, MTU change cancelled.\n",
                        dev->name);
-                if (xbuff != NULL)  
-                        kfree(xbuff);
-                if (rbuff != NULL)  
-                        kfree(rbuff);
+                kfree(xbuff);
+                kfree(rbuff);
                 return -ENOMEM;
         }
 
@@ -169,10 +163,8 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
 
         spin_unlock_bh(&sl->lock);
 
-        if (xbuff != NULL) 
-                kfree(xbuff);
-        if (rbuff != NULL)
-                kfree(rbuff);
+        kfree(xbuff);
+        kfree(rbuff);
         return 0;
 }