Merge with /home/tmlind/src/kernel/linux-2.6

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

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 75e9b3b910cc31ba9d18ff8d4c5deb281c402d14..d835e9276596dc1c4519f96355139d0543deea47 100644 (file)
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -66,7 +66,6 @@ static const char version[] =
 #endif
 
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -215,15 +214,12 @@ struct smc_local {
 
        spinlock_t lock;
 
-#ifdef SMC_CAN_USE_DATACS
-       u32     __iomem *datacs;
-#endif
-
 #ifdef SMC_USE_PXA_DMA
        /* DMA needs the physical address of the chip */
        u_long physaddr;
 #endif
        void __iomem *base;
+       void __iomem *datacs;
 };
 
 #if SMC_DEBUG > 0
@@ -500,6 +496,11 @@ static inline void  smc_rcv(struct net_device *dev)
                dev->name, packet_number, status,
                packet_len, packet_len);
 
+       if (unlikely(packet_len == 0 && !(status & RS_ERRORS))) {
+               printk(KERN_ERR "%s: bad memory timings: rxlen %u status %x\n",
+                       dev->name, packet_len, status);
+               status |= RS_TOOSHORT;
+       }
        back:
        if (unlikely(packet_len < 6 || status & RS_ERRORS)) {
                if (status & RS_TOOLONG && packet_len <= (1514 + 4 + 6)) {
@@ -2104,9 +2105,8 @@ static int smc_enable_device(struct platform_device *pdev)
         * Set the appropriate byte/word mode.
         */
        ecsr = readb(addr + (ECSR << SMC_IO_SHIFT)) & ~ECSR_IOIS8;
-#ifndef SMC_CAN_USE_16BIT
-       ecsr |= ECSR_IOIS8;
-#endif
+       if (!SMC_CAN_USE_16BIT)
+               ecsr |= ECSR_IOIS8;
        writeb(ecsr, addr + (ECSR << SMC_IO_SHIFT));
        local_irq_restore(flags);
 
@@ -2143,40 +2143,39 @@ static void smc_release_attrib(struct platform_device *pdev)
                release_mem_region(res->start, ATTRIB_SIZE);
 }
 
-#ifdef SMC_CAN_USE_DATACS
-static void smc_request_datacs(struct platform_device *pdev, struct net_device *ndev)
+static inline void smc_request_datacs(struct platform_device *pdev, struct net_device *ndev)
 {
-       struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-data32");
-       struct smc_local *lp = netdev_priv(ndev);
+       if (SMC_CAN_USE_DATACS) {
+               struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-data32");
+               struct smc_local *lp = netdev_priv(ndev);
 
-       if (!res)
-               return;
+               if (!res)
+                       return;
 
-       if(!request_mem_region(res->start, SMC_DATA_EXTENT, CARDNAME)) {
-               printk(KERN_INFO "%s: failed to request datacs memory region.\n", CARDNAME);
-               return;
-       }
+               if(!request_mem_region(res->start, SMC_DATA_EXTENT, CARDNAME)) {
+                       printk(KERN_INFO "%s: failed to request datacs memory region.\n", CARDNAME);
+                       return;
+               }
 
-       lp->datacs = ioremap(res->start, SMC_DATA_EXTENT);
+               lp->datacs = ioremap(res->start, SMC_DATA_EXTENT);
+       }
 }
 
 static void smc_release_datacs(struct platform_device *pdev, struct net_device *ndev)
 {
-       struct smc_local *lp = netdev_priv(ndev);
-       struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-data32");
+       if (SMC_CAN_USE_DATACS) {
+               struct smc_local *lp = netdev_priv(ndev);
+               struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-data32");
 
-       if (lp->datacs)
-               iounmap(lp->datacs);
+               if (lp->datacs)
+                       iounmap(lp->datacs);
 
-       lp->datacs = NULL;
+               lp->datacs = NULL;
 
-       if (res)
-               release_mem_region(res->start, SMC_DATA_EXTENT);
+               if (res)
+                       release_mem_region(res->start, SMC_DATA_EXTENT);
+       }
 }
-#else
-static void smc_request_datacs(struct platform_device *pdev, struct net_device *ndev) {}
-static void smc_release_datacs(struct platform_device *pdev, struct net_device *ndev) {}
-#endif
 
 /*
  * smc_init(void)