Commit 330a7809 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-for-4.21' of https://github.com/rjarzmik/linux into next/drivers 

This pxa update brings only a single patch, finishing the
dmaengine conversion.

* tag 'pxa-for-4.21' of https://github.com/rjarzmik/linux

:
  dmaengine: pxa: make the filter function internal

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 202f9977 c2a70a31

drivers/dma/pxa_dma.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -179,7 +179,7 @@ static unsigned int pxad_drcmr(unsigned int line) 
	return 0x1000 + line * 4;

	return 0x1000 + line * 4;

}

}





bool pxad_filter_fn(struct dma_chan *chan, void *param);

static bool pxad_filter_fn(struct dma_chan *chan, void *param);





/*

/*

 * Debug fs

 * Debug fs
@@ -1500,7 +1500,7 @@ static struct platform_driver pxad_driver = { 
	.remove		= pxad_remove,

	.remove		= pxad_remove,

};

};





bool pxad_filter_fn(struct dma_chan *chan, void *param)

static bool pxad_filter_fn(struct dma_chan *chan, void *param)

{

{

	struct pxad_chan *c = to_pxad_chan(chan);

	struct pxad_chan *c = to_pxad_chan(chan);

	struct pxad_param *p = param;

	struct pxad_param *p = param;
@@ -1513,7 +1513,6 @@ bool pxad_filter_fn(struct dma_chan *chan, void *param) 




	return true;

	return true;

}

}

EXPORT_SYMBOL_GPL(pxad_filter_fn);





module_platform_driver(pxad_driver);

module_platform_driver(pxad_driver);

include/linux/dma/pxa-dma.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -23,15 +23,4 @@ struct pxad_param { 
	enum pxad_chan_prio prio;

	enum pxad_chan_prio prio;

};

};





struct dma_chan;



#ifdef CONFIG_PXA_DMA

bool pxad_filter_fn(struct dma_chan *chan, void *param);

#else

static inline bool pxad_filter_fn(struct dma_chan *chan, void *param)

{

	return false;

}

#endif



#endif /* _PXA_DMA_H_ */
 
#endif /* _PXA_DMA_H_ */