net: smc91x: remove the dmaengine compat need

As the pxa architecture switched towards the dmaengine slave map, the
old compatibility mechanism to acquire the dma requestor line number and
priority are not needed anymore.

This patch simplifies the dma resource acquisition, using the more
generic function dma_request_slave_channel().

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 0804287628584ec24faa12a827f179a346cae0cb..b944828f9ea3ddfba9849ba0b1c6e66243cd8b78 100644 (file)
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -2019,17 +2019,10 @@ static int smc_probe(struct net_device *dev, void __iomem *ioaddr,
 #  endif
        if (lp->cfg.flags & SMC91X_USE_DMA) {
                dma_cap_mask_t mask;
-               struct pxad_param param;
 
                dma_cap_zero(mask);
                dma_cap_set(DMA_SLAVE, mask);
-               param.prio = PXAD_PRIO_LOWEST;
-               param.drcmr = -1UL;
-
-               lp->dma_chan =
-                       dma_request_slave_channel_compat(mask, pxad_filter_fn,
-                                                        &param, &dev->dev,
-                                                        "data");
+               lp->dma_chan = dma_request_channel(mask, NULL, NULL);
        }
 #endif
 

diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h
index b337ee97e0c0c7eaa0a51e9a067b13420b789aa4..a27352229fc216cd75b44d932943ad1befa1cfe0 100644 (file)
--- a/drivers/net/ethernet/smsc/smc91x.h
+++ b/drivers/net/ethernet/smsc/smc91x.h
@@ -301,7 +301,6 @@ struct smc_local {
  * as RX which can overrun memory and lose packets.
  */
 #include <linux/dma-mapping.h>
-#include <linux/dma/pxa-dma.h>
 
 #ifdef SMC_insl
 #undef SMC_insl