| Message ID | 1374251374-30186-5-git-send-email-g.liakhovetski@gmx.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Hi Guennadi, Thanks for the patch. On Friday 19 July 2013 18:29:29 Guennadi Liakhovetski wrote: > Platform data shouldn't be changed at run-time, so, pointers to it should > be const. If you move this patch to the beginning of the series you could make the pdata structures const in 02/15 and 03/15. > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> > --- > drivers/dma/sh/shdma.h | 2 +- > drivers/dma/sh/shdmac.c | 10 +++++----- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/dma/sh/shdma.h b/drivers/dma/sh/shdma.h > index 82a83f8..ae0c65f 100644 > --- a/drivers/dma/sh/shdma.h > +++ b/drivers/dma/sh/shdma.h > @@ -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; > diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c > index 6546bf9..859ddbe 100644 > --- a/drivers/dma/sh/shdmac.c > +++ b/drivers/dma/sh/shdmac.c > @@ -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; > + const struct sh_dmae_pdata *pdata; > unsigned long irqflags = IRQF_DISABLED, > chan_flag[SH_DMAE_MAX_CHANNELS] = {}; > int errirq, chan_irq[SH_DMAE_MAX_CHANNELS];
On Sun, 21 Jul 2013, Laurent Pinchart wrote: > Hi Guennadi, > > Thanks for the patch. > > On Friday 19 July 2013 18:29:29 Guennadi Liakhovetski wrote: > > Platform data shouldn't be changed at run-time, so, pointers to it should > > be const. > > If you move this patch to the beginning of the series you could make the pdata > structures const in 02/15 and 03/15. Are these actually related? I think they can be made const regardless? Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Guennadi, On Monday 22 July 2013 09:53:51 Guennadi Liakhovetski wrote: > On Sun, 21 Jul 2013, Laurent Pinchart wrote: > > On Friday 19 July 2013 18:29:29 Guennadi Liakhovetski wrote: > > > Platform data shouldn't be changed at run-time, so, pointers to it > > > should be const. > > > > If you move this patch to the beginning of the series you could make the > > pdata structures const in 02/15 and 03/15. > > Are these actually related? I think they can be made const regardless? Right, the compiler will probably not complain, as the platform data pointer introduced by patches 02 and 03 are cast to an unsigned long.
diff --git a/drivers/dma/sh/shdma.h b/drivers/dma/sh/shdma.h index 82a83f8..ae0c65f 100644 --- a/drivers/dma/sh/shdma.h +++ b/drivers/dma/sh/shdma.h @@ -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; diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index 6546bf9..859ddbe 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -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; + const struct sh_dmae_pdata *pdata; unsigned long irqflags = IRQF_DISABLED, chan_flag[SH_DMAE_MAX_CHANNELS] = {}; int errirq, chan_irq[SH_DMAE_MAX_CHANNELS];
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> --- drivers/dma/sh/shdma.h | 2 +- drivers/dma/sh/shdmac.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)