Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index beda387f2fc7..e087b9a6daaa 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -20,6 +20,7 @@
 #include <linux/version.h>
 #include <linux/pci.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/if.h>
@@ -528,7 +529,7 @@ static int fst_debug_mask = { FST_DEBUG };
 /*
  *      PCI ID lookup table
  */
-static struct pci_device_id fst_pci_dev_id[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(fst_pci_dev_id) = {
         {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID, 
          PCI_ANY_ID, 0, 0, FST_TYPE_T2P},
 
@@ -1346,8 +1347,8 @@ do_bottom_half_tx(struct fst_card_info *card)
 
                 dev = port_to_dev(port);
                 while (!(FST_RDB(card, txDescrRing[pi][port->txpos].bits) &
-                         DMA_OWN)
-                       && !(card->dmatx_in_progress)) {
+                         DMA_OWN) &&
+                       !(card->dmatx_in_progress)) {
                         /*
                          * There doesn't seem to be a txdone event per-se
                          * We seem to have to deduce it, by checking the DMA_OWN
@@ -1379,8 +1380,8 @@ do_bottom_half_tx(struct fst_card_info *card)
                                  */
                                 FST_WRW(card, txDescrRing[pi][port->txpos].bcnt,
                                         cnv_bcnt(skb->len));
-                                if ((skb->len < FST_MIN_DMA_LEN)
-                                    || (card->family == FST_FAMILY_TXP)) {
+                                if ((skb->len < FST_MIN_DMA_LEN) ||
+                                    (card->family == FST_FAMILY_TXP)) {
                                         /* Enqueue the packet with normal io */
                                         memcpy_toio(card->mem +
                                                     BUF_OFFSET(txBuffer[pi]
@@ -2030,8 +2031,8 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 /* Sanity check the parameters. We don't support partial writes
                  * when going over the top
                  */
-                if (wrthdr.size > FST_MEMSIZE || wrthdr.offset > FST_MEMSIZE
-                    || wrthdr.size + wrthdr.offset > FST_MEMSIZE) {
+                if (wrthdr.size > FST_MEMSIZE || wrthdr.offset > FST_MEMSIZE ||
+                    wrthdr.size + wrthdr.offset > FST_MEMSIZE) {
                         return -ENXIO;
                 }