Skip to content

Commit

Permalink
dma: use dev_get_platdata()
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Jingoo Han authored and Vinod Koul committed Aug 13, 2013
1 parent 696b4ff commit d4adcc0
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion drivers/dma/imx-sdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ static int __init sdma_probe(struct platform_device *pdev)
int ret;
int irq;
struct resource *iores;
struct sdma_platform_data *pdata = pdev->dev.platform_data;
struct sdma_platform_data *pdata = dev_get_platdata(&pdev->dev);
int i;
struct sdma_engine *sdma;
s32 *saddr_arr;
Expand Down
6 changes: 3 additions & 3 deletions drivers/dma/iop-adma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ static int iop_adma_alloc_chan_resources(struct dma_chan *chan)
struct iop_adma_desc_slot *slot = NULL;
int init = iop_chan->slots_allocated ? 0 : 1;
struct iop_adma_platform_data *plat_data =
iop_chan->device->pdev->dev.platform_data;
dev_get_platdata(&iop_chan->device->pdev->dev);
int num_descs_in_pool = plat_data->pool_size/IOP_ADMA_SLOT_SIZE;

/* Allocate descriptor slots */
Expand Down Expand Up @@ -1351,7 +1351,7 @@ static int iop_adma_remove(struct platform_device *dev)
struct iop_adma_device *device = platform_get_drvdata(dev);
struct dma_chan *chan, *_chan;
struct iop_adma_chan *iop_chan;
struct iop_adma_platform_data *plat_data = dev->dev.platform_data;
struct iop_adma_platform_data *plat_data = dev_get_platdata(&dev->dev);

dma_async_device_unregister(&device->common);

Expand All @@ -1376,7 +1376,7 @@ static int iop_adma_probe(struct platform_device *pdev)
struct iop_adma_device *adev;
struct iop_adma_chan *iop_chan;
struct dma_device *dma_dev;
struct iop_adma_platform_data *plat_data = pdev->dev.platform_data;
struct iop_adma_platform_data *plat_data = dev_get_platdata(&pdev->dev);

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mv_xor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ static int mv_xor_probe(struct platform_device *pdev)
{
const struct mbus_dram_target_info *dram;
struct mv_xor_device *xordev;
struct mv_xor_platform_data *pdata = pdev->dev.platform_data;
struct mv_xor_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct resource *res;
int i, ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/pl330.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2908,7 +2908,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
int i, ret, irq;
int num_chan;

pdat = adev->dev.platform_data;
pdat = dev_get_platdata(&adev->dev);

/* Allocate a new DMAC and its Channels */
pdmac = devm_kzalloc(&adev->dev, sizeof(*pdmac), GFP_KERNEL);
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sh/shdma-of.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/sh/shdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions drivers/dma/sh/sudmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ static const struct shdma_ops sudmac_shdma_ops = {

static int sudmac_probe(struct platform_device *pdev)
{
struct sudmac_pdata *pdata = pdev->dev.platform_data;
struct sudmac_pdata *pdata = dev_get_platdata(&pdev->dev);
int err, i;
struct sudmac_device *su_dev;
struct dma_device *dma_dev;
Expand Down Expand Up @@ -373,7 +373,7 @@ static int sudmac_probe(struct platform_device *pdev)
return err;

/* platform data */
su_dev->pdata = pdev->dev.platform_data;
su_dev->pdata = dev_get_platdata(&pdev->dev);

platform_set_drvdata(pdev, su_dev);

Expand Down
4 changes: 2 additions & 2 deletions drivers/dma/ste_dma40.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3139,7 +3139,7 @@ static int __init d40_phy_res_init(struct d40_base *base)

static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
{
struct stedma40_platform_data *plat_data = pdev->dev.platform_data;
struct stedma40_platform_data *plat_data = dev_get_platdata(&pdev->dev);
struct clk *clk = NULL;
void __iomem *virtbase = NULL;
struct resource *res = NULL;
Expand Down Expand Up @@ -3535,7 +3535,7 @@ static int __init d40_of_probe(struct platform_device *pdev,

static int __init d40_probe(struct platform_device *pdev)
{
struct stedma40_platform_data *plat_data = pdev->dev.platform_data;
struct stedma40_platform_data *plat_data = dev_get_platdata(&pdev->dev);
struct device_node *np = pdev->dev.of_node;
int ret = -ENOENT;
struct d40_base *base = NULL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/timb_dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ static irqreturn_t td_irq(int irq, void *devid)

static int td_probe(struct platform_device *pdev)
{
struct timb_dma_platform_data *pdata = pdev->dev.platform_data;
struct timb_dma_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct timb_dma *td;
struct resource *iomem;
int irq;
Expand Down
9 changes: 5 additions & 4 deletions drivers/dma/txx9dmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1117,9 +1117,10 @@ static void txx9dmac_off(struct txx9dmac_dev *ddev)

static int __init txx9dmac_chan_probe(struct platform_device *pdev)
{
struct txx9dmac_chan_platform_data *cpdata = pdev->dev.platform_data;
struct txx9dmac_chan_platform_data *cpdata =
dev_get_platdata(&pdev->dev);
struct platform_device *dmac_dev = cpdata->dmac_dev;
struct txx9dmac_platform_data *pdata = dmac_dev->dev.platform_data;
struct txx9dmac_platform_data *pdata = dev_get_platdata(&dmac_dev->dev);
struct txx9dmac_chan *dc;
int err;
int ch = pdev->id % TXX9_DMA_MAX_NR_CHANNELS;
Expand Down Expand Up @@ -1202,7 +1203,7 @@ static int txx9dmac_chan_remove(struct platform_device *pdev)

static int __init txx9dmac_probe(struct platform_device *pdev)
{
struct txx9dmac_platform_data *pdata = pdev->dev.platform_data;
struct txx9dmac_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct resource *io;
struct txx9dmac_dev *ddev;
u32 mcr;
Expand Down Expand Up @@ -1281,7 +1282,7 @@ static int txx9dmac_resume_noirq(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct txx9dmac_dev *ddev = platform_get_drvdata(pdev);
struct txx9dmac_platform_data *pdata = pdev->dev.platform_data;
struct txx9dmac_platform_data *pdata = dev_get_platdata(&pdev->dev);
u32 mcr;

mcr = TXX9_DMA_MCR_MSTEN | MCR_LE;
Expand Down

0 comments on commit d4adcc0

Please sign in to comment.