| Message ID | 20180419140641.27926-31-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
On Thu, 19 Apr 2018 16:06:00 +0200 Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > We should get drvdata from struct device directly. Going via > platform_device is an unneeded step back and forth. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Applied to nand/next. Thanks, Boris > --- > > Build tested only. buildbot is happy. Please apply individually. > > drivers/mtd/nand/onenand/samsung.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/mtd/nand/onenand/samsung.c b/drivers/mtd/nand/onenand/samsung.c > index 2e9d076e445a..4cce4c0311ca 100644 > --- a/drivers/mtd/nand/onenand/samsung.c > +++ b/drivers/mtd/nand/onenand/samsung.c > @@ -958,8 +958,7 @@ static int s3c_onenand_remove(struct platform_device *pdev) > > static int s3c_pm_ops_suspend(struct device *dev) > { > - struct platform_device *pdev = to_platform_device(dev); > - struct mtd_info *mtd = platform_get_drvdata(pdev); > + struct mtd_info *mtd = dev_get_drvdata(dev); > struct onenand_chip *this = mtd->priv; > > this->wait(mtd, FL_PM_SUSPENDED); > @@ -968,8 +967,7 @@ static int s3c_pm_ops_suspend(struct device *dev) > > static int s3c_pm_ops_resume(struct device *dev) > { > - struct platform_device *pdev = to_platform_device(dev); > - struct mtd_info *mtd = platform_get_drvdata(pdev); > + struct mtd_info *mtd = dev_get_drvdata(dev); > struct onenand_chip *this = mtd->priv; > > this->unlock_all(mtd);
diff --git a/drivers/mtd/nand/onenand/samsung.c b/drivers/mtd/nand/onenand/samsung.c index 2e9d076e445a..4cce4c0311ca 100644 --- a/drivers/mtd/nand/onenand/samsung.c +++ b/drivers/mtd/nand/onenand/samsung.c @@ -958,8 +958,7 @@ static int s3c_onenand_remove(struct platform_device *pdev) static int s3c_pm_ops_suspend(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct mtd_info *mtd = platform_get_drvdata(pdev); + struct mtd_info *mtd = dev_get_drvdata(dev); struct onenand_chip *this = mtd->priv; this->wait(mtd, FL_PM_SUSPENDED); @@ -968,8 +967,7 @@ static int s3c_pm_ops_suspend(struct device *dev) static int s3c_pm_ops_resume(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct mtd_info *mtd = platform_get_drvdata(pdev); + struct mtd_info *mtd = dev_get_drvdata(dev); struct onenand_chip *this = mtd->priv; this->unlock_all(mtd);
We should get drvdata from struct device directly. Going via platform_device is an unneeded step back and forth. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- Build tested only. buildbot is happy. Please apply individually. drivers/mtd/nand/onenand/samsung.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)