Skip to content

Commit

Permalink
dw_dmac: rename DT related methods to reflect their belonging
Browse files Browse the repository at this point in the history
Since we will have not only DT cases in future let's rename DT related methods
to reflect their belonging.

The rename was done as follows:
	struct dw_dma_filter_args	-> struct dw_dma_of_filter_args
	dw_dma_generic_filter()		-> dw_dma_of_filter()
	dw_dma_xlate()			-> dw_dma_of_xlate()
	dw_dma_id_table			-> dw_dma_of_id_table

There is no functional change.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Andy Shevchenko authored and Vinod Koul committed Apr 15, 2013
1 parent 75c6122 commit bd2e6b6
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions drivers/dma/dw_dmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1242,18 +1242,20 @@ static void dwc_free_chan_resources(struct dma_chan *chan)
dev_vdbg(chan2dev(chan), "%s: done\n", __func__);
}

struct dw_dma_filter_args {
/*----------------------------------------------------------------------*/

struct dw_dma_of_filter_args {
struct dw_dma *dw;
unsigned int req;
unsigned int src;
unsigned int dst;
};

static bool dw_dma_generic_filter(struct dma_chan *chan, void *param)
static bool dw_dma_of_filter(struct dma_chan *chan, void *param)
{
struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
struct dw_dma *dw = to_dw_dma(chan->device);
struct dw_dma_filter_args *fargs = param;
struct dw_dma_of_filter_args *fargs = param;
struct dw_dma_slave *dws = &dwc->slave;

/* Ensure the device matches our channel */
Expand All @@ -1273,11 +1275,11 @@ static bool dw_dma_generic_filter(struct dma_chan *chan, void *param)
return true;
}

static struct dma_chan *dw_dma_xlate(struct of_phandle_args *dma_spec,
struct of_dma *ofdma)
static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec,
struct of_dma *ofdma)
{
struct dw_dma *dw = ofdma->of_dma_data;
struct dw_dma_filter_args fargs = {
struct dw_dma_of_filter_args fargs = {
.dw = dw,
};
dma_cap_mask_t cap;
Expand All @@ -1298,7 +1300,7 @@ static struct dma_chan *dw_dma_xlate(struct of_phandle_args *dma_spec,
dma_cap_set(DMA_SLAVE, cap);

/* TODO: there should be a simpler way to do this */
return dma_request_channel(cap, dw_dma_generic_filter, &fargs);
return dma_request_channel(cap, dw_dma_of_filter, &fargs);
}

/* --------------------- Cyclic DMA API extensions -------------------- */
Expand Down Expand Up @@ -1843,7 +1845,7 @@ static int dw_probe(struct platform_device *pdev)

if (pdev->dev.of_node) {
err = of_dma_controller_register(pdev->dev.of_node,
dw_dma_xlate, dw);
dw_dma_of_xlate, dw);
if (err && err != -ENODEV)
dev_err(&pdev->dev,
"could not register of_dma_controller\n");
Expand Down Expand Up @@ -1913,11 +1915,11 @@ static const struct dev_pm_ops dw_dev_pm_ops = {
};

#ifdef CONFIG_OF
static const struct of_device_id dw_dma_id_table[] = {
static const struct of_device_id dw_dma_of_id_table[] = {
{ .compatible = "snps,dma-spear1340" },
{}
};
MODULE_DEVICE_TABLE(of, dw_dma_id_table);
MODULE_DEVICE_TABLE(of, dw_dma_of_id_table);
#endif

static const struct platform_device_id dw_dma_ids[] = {
Expand All @@ -1933,7 +1935,7 @@ static struct platform_driver dw_driver = {
.driver = {
.name = "dw_dmac",
.pm = &dw_dev_pm_ops,
.of_match_table = of_match_ptr(dw_dma_id_table),
.of_match_table = of_match_ptr(dw_dma_of_id_table),
},
.id_table = dw_dma_ids,
};
Expand Down

0 comments on commit bd2e6b6

Please sign in to comment.