Re: [PATCH] mtd: bcm47xxsflash: use platform_(set|get)_drvdata

Boris Brezillon
2017-01-16T14:21:53Z

On Mon, 16 Jan 2017 14:04:09 +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 patch will be followed by cleaning struct bcma_sflash which will go
> through another tree where bcma development happens.

Why not removing the ->priv field from the bcma_sflash struct
definition in this patch?
If it needs to go through a different tree we can ack the patch and let
the other maintainer(s) take the whole series.

Note that ->mtd seems to be unused, and should probably be removed as
well (in a separate patch of course). But I guess you already know that.

>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
> drivers/mtd/devices/bcm47xxsflash.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 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);