Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d7bc29c authored by Robert Jarzmik's avatar Robert Jarzmik
Browse files

net: smc911x: 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: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 35b69d62

drivers/net/ethernet/smsc/smc911x.c

+2 −11
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ static const char version[] = 
#include <linux/skbuff.h>



#include <linux/dmaengine.h>

#include <linux/dma/pxa-dma.h>



#include <asm/io.h>
@@ -1795,7 +1794,6 @@ static int smc911x_probe(struct net_device *dev) 
#ifdef SMC_USE_DMA

	struct dma_slave_config	config;

	dma_cap_mask_t mask;

	struct pxad_param param;

#endif



	DBG(SMC_DEBUG_FUNC, dev, "--> %s\n", __func__);
@@ -1971,15 +1969,8 @@ static int smc911x_probe(struct net_device *dev) 


	dma_cap_zero(mask);

	dma_cap_set(DMA_SLAVE, mask);

	param.prio = PXAD_PRIO_LOWEST;

	param.drcmr = -1UL;



	lp->rxdma =

		dma_request_slave_channel_compat(mask, pxad_filter_fn,

						 &param, &dev->dev, "rx");

	lp->txdma =

		dma_request_slave_channel_compat(mask, pxad_filter_fn,

						 &param, &dev->dev, "tx");

	lp->rxdma = dma_request_channel(mask, NULL, NULL);

	lp->txdma = dma_request_channel(mask, NULL, NULL);

	lp->rxdma_active = 0;

	lp->txdma_active = 0;