diff mbox

[1/2] dma: tegra: make tegra_dma.chip_data a pointer to const data

Message ID 1346230295-15898-1-git-send-email-u.kleine-koenig@pengutronix.de
State Not Applicable, archived
Headers show

Commit Message

Uwe Kleine-König Aug. 29, 2012, 8:51 a.m. UTC
From: Laxman Dewangan <ldewangan@nvidia.com>

This prepares *of_device_id.data becoming const. Without this change
the following warning would occur:

	drivers/dma/tegra20-apb-dma.c: In function 'tegra_dma_probe':
	drivers/dma/tegra20-apb-dma.c:1210:9: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]

[ukl: split Laxman's patch to prevent warnings in the middle of the
series. Original patch was sent with msgid
1346217447-19730-1-git-send-email-ldewangan@nvidia.com]

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/dma/tegra20-apb-dma.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stephen Warren Sept. 10, 2012, 6:21 p.m. UTC | #1
On 08/29/2012 02:51 AM, Uwe Kleine-König wrote:
> From: Laxman Dewangan <ldewangan@nvidia.com>
> 
> This prepares *of_device_id.data becoming const. Without this change
> the following warning would occur:
> 
> 	drivers/dma/tegra20-apb-dma.c: In function 'tegra_dma_probe':
> 	drivers/dma/tegra20-apb-dma.c:1210:9: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
> 
> [ukl: split Laxman's patch to prevent warnings in the middle of the
> series. Original patch was sent with msgid
> 1346217447-19730-1-git-send-email-ldewangan@nvidia.com]
> 
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
> Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Uwe,

I don't see these patches in linux-next, so compilation is still broken.
Can you please apply them? Thanks.
--
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
Uwe Kleine-König Sept. 11, 2012, 6:58 a.m. UTC | #2
On Mon, Sep 10, 2012 at 12:21:09PM -0600, Stephen Warren wrote:
> On 08/29/2012 02:51 AM, Uwe Kleine-König wrote:
> > From: Laxman Dewangan <ldewangan@nvidia.com>
> > 
> > This prepares *of_device_id.data becoming const. Without this change
> > the following warning would occur:
> > 
> > 	drivers/dma/tegra20-apb-dma.c: In function 'tegra_dma_probe':
> > 	drivers/dma/tegra20-apb-dma.c:1210:9: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
> > 
> > [ukl: split Laxman's patch to prevent warnings in the middle of the
> > series. Original patch was sent with msgid
> > 1346217447-19730-1-git-send-email-ldewangan@nvidia.com]
> > 
> > Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
> > Acked-by: Stephen Warren <swarren@wwwdotorg.org>
> > Acked-by: Vinod Koul <vinod.koul@linux.intel.com>
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Uwe,
> 
> I don't see these patches in linux-next, so compilation is still broken.
> Can you please apply them? Thanks.
I have, but my new tree didn't make it into arm-soc. Arnd/Olof, can you
please refetch it?

Thanks
Uwe
diff mbox

Patch

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index d52dbc6..29a39b8 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;
@@ -1197,7 +1197,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;