Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
  [ARM] 4578/1: CM-x270: PCMCIA support
  [ARM] 4577/1: ITE 8152 PCI bridge support
  [ARM] 4576/1: CM-X270 machine support
  [ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
  [ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
  [ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
  [ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
  [ARM] pxa: PXA3xx base support
  [NET] smc91x: fix PXA DMA support code
  [SERIAL] Fix console initialisation ordering
  [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
  [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
  [ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
  [ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
  [ARM] Rename consistent_sync() as dma_cache_maint()
  [ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
  [ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
  [ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
  [ARM] 4594/1: ns9xxx: use the new gpio functions
  [ARM] 4593/1: ns9xxx: implement generic clockevents
  ...

1 files changed, 7 insertions, 48 deletions

diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 24e610e711e8..7da7589d45dd 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -173,49 +173,6 @@ MODULE_LICENSE("GPL");
  */
 #define MII_DELAY               1
 
-/* store this information for the driver.. */
-struct smc_local {
-        /*
-         * If I have to wait until memory is available to send a
-         * packet, I will store the skbuff here, until I get the
-         * desired memory.  Then, I'll send it out and free it.
-         */
-        struct sk_buff *pending_tx_skb;
-        struct tasklet_struct tx_task;
-
-        /* version/revision of the SMC91x chip */
-        int     version;
-
-        /* Contains the current active transmission mode */
-        int     tcr_cur_mode;
-
-        /* Contains the current active receive mode */
-        int     rcr_cur_mode;
-
-        /* Contains the current active receive/phy mode */
-        int     rpc_cur_mode;
-        int     ctl_rfduplx;
-        int     ctl_rspeed;
-
-        u32     msg_enable;
-        u32     phy_type;
-        struct mii_if_info mii;
-
-        /* work queue */
-        struct work_struct phy_configure;
-        struct net_device *dev;
-        int     work_pending;
-
-        spinlock_t lock;
-
-#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
 #define DBG(n, args...)                                 \
         do {                                            \
@@ -2215,17 +2172,19 @@ static int smc_drv_probe(struct platform_device *pdev)
                 goto out_release_attrib;
         }
 
-        platform_set_drvdata(pdev, ndev);
-        ret = smc_probe(ndev, addr);
-        if (ret != 0)
-                goto out_iounmap;
 #ifdef SMC_USE_PXA_DMA
-        else {
+        {
                 struct smc_local *lp = netdev_priv(ndev);
+                lp->device = &pdev->dev;
                 lp->physaddr = res->start;
         }
 #endif
 
+        platform_set_drvdata(pdev, ndev);
+        ret = smc_probe(ndev, addr);
+        if (ret != 0)
+                goto out_iounmap;
+
         smc_request_datacs(pdev, ndev);
 
         return 0;