On Fri, Mar 06, 2015 at 01:42:43AM +0000, Ben Hutchings wrote:
> Commit 7bced397510a ("net_dma: simple removal") removed the net_dma
> functionality due to unfixable bugs. However it left behind the
> net_dma_find_channel() function and some declarations in
> <linux/dmaengine.h>, which have been unused since then.
Hi ben,
You are a day late, I have already applied, patches from maxime for the same
--
~Vinod
>
> Signed-off-by: Ben Hutchings <ben.hutchings@xxxxxxxxxxxxxxx>
> ---
> drivers/dma/dmaengine.c | 13 -------------
> include/linux/dmaengine.h | 23 -----------------------
> 2 files changed, 36 deletions(-)
>
> diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
> index f15712f2fec6..f364adb1f866 100644
> --- a/drivers/dma/dmaengine.c
> +++ b/drivers/dma/dmaengine.c
> @@ -356,19 +356,6 @@ struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type)
> EXPORT_SYMBOL(dma_find_channel);
>
> /*
> - * net_dma_find_channel - find a channel for net_dma
> - * net_dma has alignment requirements
> - */
> -struct dma_chan *net_dma_find_channel(void)
> -{
> - struct dma_chan *chan = dma_find_channel(DMA_MEMCPY);
> - if (chan && !is_dma_copy_aligned(chan->device, 1, 1, 1))
> - return NULL;
> -
> - return chan;
> -}
> -EXPORT_SYMBOL(net_dma_find_channel);
> -
> /**
> * dma_issue_pending_all - flush all pending operations across all channels
> */
> diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
> index b6997a0cb528..30d0a050e50f 100644
> --- a/include/linux/dmaengine.h
> +++ b/include/linux/dmaengine.h
> @@ -1098,7 +1098,6 @@ void dma_async_device_unregister(struct dma_device *device);
> void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
> struct dma_chan *dma_get_slave_channel(struct dma_chan *chan);
> struct dma_chan *dma_get_any_slave_channel(struct dma_device *device);
> -struct dma_chan *net_dma_find_channel(void);
> #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
> #define dma_request_slave_channel_compat(mask, x, y, dev, name) \
> __dma_request_slave_channel_compat(&(mask), x, y, dev, name)
> @@ -1117,26 +1116,4 @@ static inline struct dma_chan
> return __dma_request_channel(mask, fn, fn_param);
> }
>
> -/* --- Helper iov-locking functions --- */
> -
> -struct dma_page_list {
> - char __user *base_address;
> - int nr_pages;
> - struct page **pages;
> -};
> -
> -struct dma_pinned_list {
> - int nr_iovecs;
> - struct dma_page_list page_list[0];
> -};
> -
> -struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
> -void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
> -
> -dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
> - struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
> -dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
> - struct dma_pinned_list *pinned_list, struct page *page,
> - unsigned int offset, size_t len);
> -
> #endif /* DMAENGINE_H */
> --
> 1.7.10.4
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe dmaengine" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
