| Message ID | 1345976063-24437-1-git-send-email-ldewangan@nvidia.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 08/26/2012 03:14 AM, Laxman Dewangan wrote: > The membe "data" of structure of_device_id is changed to const > pointer. Hence initializing this with const type data. > This will fix the compilation warning like > drivers/dma/tegra20-apb-dma.c:1217:9: warning: assignment discards 'const' qualifier from > pointer target type [enabled by default] > > This warning came after the change > --------- > commit 98d7bbb9929bcc14e11ac8a55245a4f2dc174e17 > Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > of: add const to struct *of_device_id.data > --------- Acked-by: Stephen Warren <swarren@wwwdotorg.org> I wonder if this should go through Uwe's branch that made similar changes for all other drivers though? Uwe now CC'd. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Aug 26, 2012 at 09:25:26PM -0700, Stephen Warren wrote: > On 08/26/2012 03:14 AM, Laxman Dewangan wrote: > > The membe "data" of structure of_device_id is changed to const > > pointer. Hence initializing this with const type data. > > This will fix the compilation warning like > > drivers/dma/tegra20-apb-dma.c:1217:9: warning: assignment discards 'const' qualifier from > > pointer target type [enabled by default] > > > > This warning came after the change > > --------- > > commit 98d7bbb9929bcc14e11ac8a55245a4f2dc174e17 > > Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > of: add const to struct *of_device_id.data > > --------- > > Acked-by: Stephen Warren <swarren@wwwdotorg.org> > > I wonder if this should go through Uwe's branch that made similar > changes for all other drivers though? Uwe now CC'd. If you forward/bounce the patch to me I can include it in my branch. I wonder if I missed this warning while testing. I did test all arm defconfigs based on 3.6-rc1. Best regards Uwe
On Sun, 2012-08-26 at 21:25 -0700, Stephen Warren wrote: > On 08/26/2012 03:14 AM, Laxman Dewangan wrote: > > The membe "data" of structure of_device_id is changed to const > > pointer. Hence initializing this with const type data. > > This will fix the compilation warning like > > drivers/dma/tegra20-apb-dma.c:1217:9: warning: assignment discards 'const' qualifier from > > pointer target type [enabled by default] > > > > This warning came after the change > > --------- > > commit 98d7bbb9929bcc14e11ac8a55245a4f2dc174e17 > > Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > of: add const to struct *of_device_id.data > > --------- > > Acked-by: Stephen Warren <swarren@wwwdotorg.org> Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index 24acd71..09a15ff 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c @@ -201,7 +201,7 @@ struct tegra_dma { struct clk *dma_clk; spinlock_t global_lock; void __iomem *base_addr; - struct tegra_dma_chip_data *chip_data; + const struct tegra_dma_chip_data *chip_data; /* Some register need to be cache before suspend */ u32 reg_gen; @@ -1173,14 +1173,14 @@ static void tegra_dma_free_chan_resources(struct dma_chan *dc) } /* Tegra20 specific DMA controller information */ -static struct tegra_dma_chip_data tegra20_dma_chip_data = { +static const struct tegra_dma_chip_data tegra20_dma_chip_data = { .nr_channels = 16, .max_dma_count = 1024UL * 64, }; #if defined(CONFIG_OF) /* Tegra30 specific DMA controller information */ -static struct tegra_dma_chip_data tegra30_dma_chip_data = { +static const struct tegra_dma_chip_data tegra30_dma_chip_data = { .nr_channels = 32, .max_dma_count = 1024UL * 64, }; @@ -1204,7 +1204,7 @@ static int __devinit tegra_dma_probe(struct platform_device *pdev) struct tegra_dma *tdma; int ret; int i; - struct tegra_dma_chip_data *cdata = NULL; + const struct tegra_dma_chip_data *cdata = NULL; if (pdev->dev.of_node) { const struct of_device_id *match;
The membe "data" of structure of_device_id is changed to const pointer. Hence initializing this with const type data. This will fix the compilation warning like drivers/dma/tegra20-apb-dma.c:1217:9: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] This warning came after the change --------- commit 98d7bbb9929bcc14e11ac8a55245a4f2dc174e17 Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> of: add const to struct *of_device_id.data --------- Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> --- drivers/dma/tegra20-apb-dma.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)