aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-09-05 15:23:44 -0400
committerOlof Johansson <olof@lixom.net>2013-09-10 17:23:20 -0400
commit1e2c2390ef51fa4fcdb1082e8da11025ef329116 (patch)
tree3c70be033c5b70bc8d7fa2d29a167ecfd3a40743 /drivers/i2c/busses
parent3c78d113fb9bdb50d60519a8b5d7f56cd1a50a8f (diff)
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 <jg1.han@samsung.com> Acked-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-davinci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 57473415be10..132369fad4e0 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)
662#endif 662#endif
663 dev->dev = &pdev->dev; 663 dev->dev = &pdev->dev;
664 dev->irq = irq->start; 664 dev->irq = irq->start;
665 dev->pdata = dev_get_platdata(&dev->dev); 665 dev->pdata = dev_get_platdata(&pdev->dev);
666 platform_set_drvdata(pdev, dev); 666 platform_set_drvdata(pdev, dev);
667 667
668 if (!dev->pdata && pdev->dev.of_node) { 668 if (!dev->pdata && pdev->dev.of_node) {