Loading drivers/dma/mxs-dma.c +2 −6 Original line number Diff line number Diff line Loading @@ -716,7 +716,6 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) } struct mxs_dma_filter_param { struct device_node *of_node; unsigned int chan_id; }; Loading @@ -727,9 +726,6 @@ static bool mxs_dma_filter_fn(struct dma_chan *chan, void *fn_param) struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; int chan_irq; if (mxs_dma->dma_device.dev->of_node != param->of_node) return false; if (chan->chan_id != param->chan_id) return false; Loading @@ -752,13 +748,13 @@ static struct dma_chan *mxs_dma_xlate(struct of_phandle_args *dma_spec, if (dma_spec->args_count != 1) return NULL; param.of_node = ofdma->of_node; param.chan_id = dma_spec->args[0]; if (param.chan_id >= mxs_dma->nr_channels) return NULL; return dma_request_channel(mask, mxs_dma_filter_fn, ¶m); return __dma_request_channel(&mask, mxs_dma_filter_fn, ¶m, ofdma->of_node); } static int __init mxs_dma_probe(struct platform_device *pdev) Loading Loading
drivers/dma/mxs-dma.c +2 −6 Original line number Diff line number Diff line Loading @@ -716,7 +716,6 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma) } struct mxs_dma_filter_param { struct device_node *of_node; unsigned int chan_id; }; Loading @@ -727,9 +726,6 @@ static bool mxs_dma_filter_fn(struct dma_chan *chan, void *fn_param) struct mxs_dma_engine *mxs_dma = mxs_chan->mxs_dma; int chan_irq; if (mxs_dma->dma_device.dev->of_node != param->of_node) return false; if (chan->chan_id != param->chan_id) return false; Loading @@ -752,13 +748,13 @@ static struct dma_chan *mxs_dma_xlate(struct of_phandle_args *dma_spec, if (dma_spec->args_count != 1) return NULL; param.of_node = ofdma->of_node; param.chan_id = dma_spec->args[0]; if (param.chan_id >= mxs_dma->nr_channels) return NULL; return dma_request_channel(mask, mxs_dma_filter_fn, ¶m); return __dma_request_channel(&mask, mxs_dma_filter_fn, ¶m, ofdma->of_node); } static int __init mxs_dma_probe(struct platform_device *pdev) Loading