From 1e2c2390ef51fa4fcdb1082e8da11025ef329116 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Thu, 5 Sep 2013 12:23:44 -0700 Subject: [PATCH] i2c: davinci: Fix bad dev_get_platdata() conversion commit 6d4028c644e (i2c: use dev_get_platdata()) did a bad conversion of this one case: drivers/i2c/busses/i2c-davinci.c: In function 'davinci_i2c_probe': drivers/i2c/busses/i2c-davinci.c:665:2: warning: passing argument 1 of 'dev_get_platdata' from incompatible pointer type [enabled by default] Reviewed-by: Jingoo Han Acked-by: Wolfram Sang Signed-off-by: Olof Johansson --- drivers/i2c/busses/i2c-davinci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 5747341..132369f 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -662,7 +662,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) #endif dev->dev = &pdev->dev; dev->irq = irq->start; - dev->pdata = dev_get_platdata(&dev->dev); + dev->pdata = dev_get_platdata(&pdev->dev); platform_set_drvdata(pdev, dev); if (!dev->pdata && pdev->dev.of_node) { -- 2.7.4