diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-07-30 17:18:33 +0900 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2014-11-28 23:37:15 -0800 |
| commit | 2089fda5916da61235c3b39c26a24031c5206036 (patch) | |
| tree | 3482ea2e8f68d01d1599430618705a21c7d69018 /drivers/mtd/nand/davinci_nand.c | |
| parent | 181592d214b8629ef7756a94e8158562e276f831 (diff) | |
| download | olio-linux-3.10-2089fda5916da61235c3b39c26a24031c5206036.tar.xz olio-linux-3.10-2089fda5916da61235c3b39c26a24031c5206036.zip | |
mtd: nand: use dev_get_platdata()
Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Conflicts:
drivers/mtd/nand/gpio.c
drivers/mtd/nand/pxa3xx_nand.c
Change-Id: I43a3aa34f7d354cbf7e971b3a1c77edab91d3874
Diffstat (limited to 'drivers/mtd/nand/davinci_nand.c')
| -rw-r--r-- | drivers/mtd/nand/davinci_nand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index c3e15a55817..758a111a3bc 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -530,7 +530,7 @@ MODULE_DEVICE_TABLE(of, davinci_nand_of_match); static struct davinci_nand_pdata *nand_davinci_get_pdata(struct platform_device *pdev) { - if (!pdev->dev.platform_data && pdev->dev.of_node) { + if (!dev_get_platdata(&pdev->dev) && pdev->dev.of_node) { struct davinci_nand_pdata *pdata; const char *mode; u32 prop; @@ -575,13 +575,13 @@ static struct davinci_nand_pdata pdata->bbt_options = NAND_BBT_USE_FLASH; } - return pdev->dev.platform_data; + return dev_get_platdata(&pdev->dev); } #else static struct davinci_nand_pdata *nand_davinci_get_pdata(struct platform_device *pdev) { - return pdev->dev.platform_data; + return dev_get_platdata(&pdev->dev); } #endif |