| From 6343032750049bb1fab31d5f41fff22912984ed6 Mon Sep 17 00:00:00 2001 |
| From: Jingoo Han <jg1.han@samsung.com> |
| Date: Tue, 30 Jul 2013 17:09:11 +0900 |
| Subject: dma: use dev_get_platdata() |
| |
| Use the wrapper function for retrieving the platform data instead of |
| accessing dev->platform_data directly. |
| |
| Signed-off-by: Jingoo Han <jg1.han@samsung.com> |
| Signed-off-by: Vinod Koul <vinod.koul@intel.com> |
| (cherry picked from commit d4adcc0160404c3237fe6ffa09dd2dd039dd3975) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| drivers/dma/imx-sdma.c |
| drivers/dma/iop-adma.c |
| drivers/dma/mv_xor.c |
| drivers/dma/pl330.c |
| drivers/dma/sh/sudmac.c |
| drivers/dma/ste_dma40.c |
| drivers/dma/timb_dma.c |
| drivers/dma/txx9dmac.c |
| --- |
| drivers/dma/sh/shdma-of.c | 2 +- |
| drivers/dma/sh/shdma.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/dma/sh/shdma-of.c b/drivers/dma/sh/shdma-of.c |
| index 11bcb05cd79c..966aaab0b4d3 100644 |
| --- a/drivers/dma/sh/shdma-of.c |
| +++ b/drivers/dma/sh/shdma-of.c |
| @@ -42,7 +42,7 @@ static struct dma_chan *shdma_of_xlate(struct of_phandle_args *dma_spec, |
| |
| static int shdma_of_probe(struct platform_device *pdev) |
| { |
| - const struct of_dev_auxdata *lookup = pdev->dev.platform_data; |
| + const struct of_dev_auxdata *lookup = dev_get_platdata(&pdev->dev); |
| int ret; |
| |
| if (!lookup) |
| diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c |
| index b67f45f5c271..b388b12f078e 100644 |
| --- a/drivers/dma/sh/shdma.c |
| +++ b/drivers/dma/sh/shdma.c |
| @@ -660,7 +660,7 @@ static const struct shdma_ops sh_dmae_shdma_ops = { |
| |
| static int sh_dmae_probe(struct platform_device *pdev) |
| { |
| - struct sh_dmae_pdata *pdata = pdev->dev.platform_data; |
| + struct sh_dmae_pdata *pdata = dev_get_platdata(&pdev->dev); |
| unsigned long irqflags = IRQF_DISABLED, |
| chan_flag[SH_DMAE_MAX_CHANNELS] = {}; |
| int errirq, chan_irq[SH_DMAE_MAX_CHANNELS]; |
| -- |
| 1.8.5.rc3 |
| |