DMA: shdma: make a pointer const
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Fri, 2 Aug 2013 14:18:09 +0000 (16:18 +0200)
committerVinod Koul <vinod.koul@intel.com>
Tue, 27 Aug 2013 08:55:03 +0000 (14:25 +0530)
Platform data shouldn't be changed at run-time, so, pointers to it should
be const.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/sh/shdma.c
drivers/dma/sh/shdma.h

index e507bb285fd042c72c3655ec433816d1379e4274..3b4bee933dd7aa0645f139cbd54d9ad15c971a6c 100644 (file)
@@ -177,7 +177,7 @@ static bool dmae_is_busy(struct sh_dmae_chan *sh_chan)
 static unsigned int calc_xmit_shift(struct sh_dmae_chan *sh_chan, u32 chcr)
 {
        struct sh_dmae_device *shdev = to_sh_dev(sh_chan);
-       struct sh_dmae_pdata *pdata = shdev->pdata;
+       const struct sh_dmae_pdata *pdata = shdev->pdata;
        int cnt = ((chcr & pdata->ts_low_mask) >> pdata->ts_low_shift) |
                ((chcr & pdata->ts_high_mask) >> pdata->ts_high_shift);
 
@@ -190,7 +190,7 @@ static unsigned int calc_xmit_shift(struct sh_dmae_chan *sh_chan, u32 chcr)
 static u32 log2size_to_chcr(struct sh_dmae_chan *sh_chan, int l2size)
 {
        struct sh_dmae_device *shdev = to_sh_dev(sh_chan);
-       struct sh_dmae_pdata *pdata = shdev->pdata;
+       const struct sh_dmae_pdata *pdata = shdev->pdata;
        int i;
 
        for (i = 0; i < pdata->ts_shift_num; i++)
@@ -250,7 +250,7 @@ static int dmae_set_chcr(struct sh_dmae_chan *sh_chan, u32 val)
 static int dmae_set_dmars(struct sh_dmae_chan *sh_chan, u16 val)
 {
        struct sh_dmae_device *shdev = to_sh_dev(sh_chan);
-       struct sh_dmae_pdata *pdata = shdev->pdata;
+       const struct sh_dmae_pdata *pdata = shdev->pdata;
        const struct sh_dmae_channel *chan_pdata = &pdata->channel[sh_chan->shdma_chan.id];
        void __iomem *addr = shdev->dmars;
        unsigned int shift = chan_pdata->dmars_bit;
@@ -319,7 +319,7 @@ static const struct sh_dmae_slave_config *dmae_find_slave(
        struct sh_dmae_chan *sh_chan, int match)
 {
        struct sh_dmae_device *shdev = to_sh_dev(sh_chan);
-       struct sh_dmae_pdata *pdata = shdev->pdata;
+       const struct sh_dmae_pdata *pdata = shdev->pdata;
        const struct sh_dmae_slave_config *cfg;
        int i;
 
@@ -665,7 +665,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;
+       const struct sh_dmae_pdata *pdata = pdev->dev.platform_data;
        unsigned long irqflags = IRQF_DISABLED,
                chan_flag[SH_DMAE_MAX_CHANNELS] = {};
        int errirq, chan_irq[SH_DMAE_MAX_CHANNELS];
index 06aae6ebc82b65dd3217039ded5ce25454543b6f..3d9dca177860d87ada4e56e0cc2f5007651e7df9 100644 (file)
@@ -36,7 +36,7 @@ struct sh_dmae_chan {
 struct sh_dmae_device {
        struct shdma_dev shdma_dev;
        struct sh_dmae_chan *chan[SH_DMAE_MAX_CHANNELS];
-       struct sh_dmae_pdata *pdata;
+       const struct sh_dmae_pdata *pdata;
        struct list_head node;
        void __iomem *chan_reg;
        void __iomem *dmars;