| Message ID | 20170116162818.12094-1-zajec5@gmail.com |
|---|---|
| State | Accepted |
| Commit | be5e5099183301fb7920f8f6b66bd3ac1f820a97 |
| Delegated to: | Brian Norris |
| Headers | show |
Rafał Miłecki <zajec5@gmail.com> writes: > From: Rafał Miłecki <rafal@milecki.pl> > > We have generic place & helpers for storing platform driver data so > there is no reason for using custom priv pointer. > > This allows cleaning up struct bcma_sflash from unneeded fields. > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > Kalle: This is mtd focused patch, so I guess it should go through mtd tree. Do > you find bcma change important enough to care to Ack it? :) Sure :) Feel free to take the patch via mtd tree, I'm not expecting to see any conflicts with this patch. For the bcma part: Acked-by: Kalle Valo <kvalo@codeaurora.org>
On Mon, 16 Jan 2017 17:28:18 +0100 Rafał Miłecki <zajec5@gmail.com> wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > We have generic place & helpers for storing platform driver data so > there is no reason for using custom priv pointer. > > This allows cleaning up struct bcma_sflash from unneeded fields. > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > Kalle: This is mtd focused patch, so I guess it should go through mtd tree. Do > you find bcma change important enough to care to Ack it? :) > --- > drivers/mtd/devices/bcm47xxsflash.c | 6 +++--- > include/linux/bcma/bcma_driver_chipcommon.h | 3 --- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/mtd/devices/bcm47xxsflash.c b/drivers/mtd/devices/bcm47xxsflash.c > index 514be04..4decd8c 100644 > --- a/drivers/mtd/devices/bcm47xxsflash.c > +++ b/drivers/mtd/devices/bcm47xxsflash.c > @@ -284,7 +284,6 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) > b47s = devm_kzalloc(dev, sizeof(*b47s), GFP_KERNEL); > if (!b47s) > return -ENOMEM; > - sflash->priv = b47s; > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (!res) { > @@ -334,6 +333,8 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) > b47s->size = sflash->size; > bcm47xxsflash_fill_mtd(b47s, &pdev->dev); > > + platform_set_drvdata(pdev, b47s); > + > err = mtd_device_parse_register(&b47s->mtd, probes, NULL, NULL, 0); > if (err) { > pr_err("Failed to register MTD device: %d\n", err); > @@ -349,8 +350,7 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) > > static int bcm47xxsflash_bcma_remove(struct platform_device *pdev) > { > - struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev); > - struct bcm47xxsflash *b47s = sflash->priv; > + struct bcm47xxsflash *b47s = platform_get_drvdata(pdev); > > mtd_device_unregister(&b47s->mtd); > iounmap(b47s->window); > diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h > index b20e3d5..2f1c690 100644 > --- a/include/linux/bcma/bcma_driver_chipcommon.h > +++ b/include/linux/bcma/bcma_driver_chipcommon.h > @@ -593,9 +593,6 @@ struct bcma_sflash { > u32 blocksize; > u16 numblocks; > u32 size; > - > - struct mtd_info *mtd; > - void *priv; > }; > #endif >
On Mon, Jan 16, 2017 at 05:28:18PM +0100, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > We have generic place & helpers for storing platform driver data so > there is no reason for using custom priv pointer. > > This allows cleaning up struct bcma_sflash from unneeded fields. > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > Kalle: This is mtd focused patch, so I guess it should go through mtd tree. Do > you find bcma change important enough to care to Ack it? :) Applied to l2-mtd.git.
diff --git a/drivers/mtd/devices/bcm47xxsflash.c b/drivers/mtd/devices/bcm47xxsflash.c index 514be04..4decd8c 100644 --- a/drivers/mtd/devices/bcm47xxsflash.c +++ b/drivers/mtd/devices/bcm47xxsflash.c @@ -284,7 +284,6 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) b47s = devm_kzalloc(dev, sizeof(*b47s), GFP_KERNEL); if (!b47s) return -ENOMEM; - sflash->priv = b47s; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -334,6 +333,8 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) b47s->size = sflash->size; bcm47xxsflash_fill_mtd(b47s, &pdev->dev); + platform_set_drvdata(pdev, b47s); + err = mtd_device_parse_register(&b47s->mtd, probes, NULL, NULL, 0); if (err) { pr_err("Failed to register MTD device: %d\n", err); @@ -349,8 +350,7 @@ static int bcm47xxsflash_bcma_probe(struct platform_device *pdev) static int bcm47xxsflash_bcma_remove(struct platform_device *pdev) { - struct bcma_sflash *sflash = dev_get_platdata(&pdev->dev); - struct bcm47xxsflash *b47s = sflash->priv; + struct bcm47xxsflash *b47s = platform_get_drvdata(pdev); mtd_device_unregister(&b47s->mtd); iounmap(b47s->window); diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index b20e3d5..2f1c690 100644 --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h @@ -593,9 +593,6 @@ struct bcma_sflash { u32 blocksize; u16 numblocks; u32 size; - - struct mtd_info *mtd; - void *priv; }; #endif