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

Commit cbc654c8 authored by Robert Jarzmik's avatar Robert Jarzmik
Browse files

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

drivers/net/ethernet/smsc/smc91x.c

+1 −8
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/smsc/smc91x.h

+0 −1
Original line number Diff line number Diff line
@@ -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