Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 453810b7 authored by Jingoo Han's avatar Jingoo Han Committed by David Woodhouse
Browse files

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: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent d20d5a57

drivers/mtd/nand/atmel_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -2023,7 +2023,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) 
		if (res)

			goto err_nand_ioremap;

	} else {

		memcpy(&host->board, pdev->dev.platform_data,

		memcpy(&host->board, dev_get_platdata(&pdev->dev),

		       sizeof(struct atmel_nand_data));

	}

drivers/mtd/nand/au1550nd.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static int au1550nd_probe(struct platform_device *pdev) 
	struct resource *r;

	int ret, cs;



	pd = pdev->dev.platform_data;

	pd = dev_get_platdata(&pdev->dev);

	if (!pd) {

		dev_err(&pdev->dev, "missing platform data\n");

		return -ENODEV;

drivers/mtd/nand/bf5xx_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct bf5xx_nand_info *to_nand_info(struct platform_device *pdev) 


static struct bf5xx_nand_platform *to_nand_plat(struct platform_device *pdev)

{

	return pdev->dev.platform_data;

	return dev_get_platdata(&pdev->dev);

}



/*

drivers/mtd/nand/davinci_nand.c

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/mtd/nand/gpio.c

+3 −3
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ static inline int gpio_nand_get_config(const struct device *dev, 
	if (!ret)

		return ret;



	if (dev->platform_data) {

		memcpy(plat, dev->platform_data, sizeof(*plat));

	if (dev_get_platdata(dev)) {

		memcpy(plat, dev_get_platdata(dev), sizeof(*plat));

		return 0;

	}
@@ -207,7 +207,7 @@ static int gpio_nand_probe(struct platform_device *pdev) 
	struct mtd_part_parser_data ppdata = {};

	int ret = 0;



	if (!pdev->dev.of_node && !pdev->dev.platform_data)

	if (!pdev->dev.of_node && !dev_get_platdata(&pdev->dev))

		return -EINVAL;



	gpiomtd = devm_kzalloc(&pdev->dev, sizeof(*gpiomtd), GFP_KERNEL);