| Message ID | 1450113250-12036-1-git-send-email-boris.brezillon@free-electrons.com |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Dec 14, 2015 at 06:14:10PM +0100, Boris Brezillon wrote: > bcm47xxnflash_remove() is supposed to unregister the NAND device previously > registered in bcm47xxnflash_probe(), but the current implementation just > test for the always NULL ->mtd platform data field (and does not call the > right function to unregister it). > > Kill the useless ->mtd field in struct bcma_nflash, and release the real > NAND device in bcm47xxnflash_remove(). > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Fixes: a5401370c520 ("mtd: prepare place for BCMA NAND flash driver(s)") > Cc: Rafał Miłecki <zajec5@gmail.com> > --- > drivers/mtd/nand/bcm47xxnflash/main.c | 7 ++++--- > include/linux/bcma/bcma_driver_chipcommon.h | 4 ---- > 2 files changed, 4 insertions(+), 7 deletions(-) Hmm, looks awfully similar... http://patchwork.ozlabs.org/patch/554164/
Hi Brian, On Mon, 14 Dec 2015 09:30:11 -0800 Brian Norris <computersforpeace@gmail.com> wrote: > On Mon, Dec 14, 2015 at 06:14:10PM +0100, Boris Brezillon wrote: > > bcm47xxnflash_remove() is supposed to unregister the NAND device previously > > registered in bcm47xxnflash_probe(), but the current implementation just > > test for the always NULL ->mtd platform data field (and does not call the > > right function to unregister it). > > > > Kill the useless ->mtd field in struct bcma_nflash, and release the real > > NAND device in bcm47xxnflash_remove(). > > > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > Fixes: a5401370c520 ("mtd: prepare place for BCMA NAND flash driver(s)") > > Cc: Rafał Miłecki <zajec5@gmail.com> > > --- > > drivers/mtd/nand/bcm47xxnflash/main.c | 7 ++++--- > > include/linux/bcma/bcma_driver_chipcommon.h | 4 ---- > > 2 files changed, 4 insertions(+), 7 deletions(-) > > Hmm, looks awfully similar... > > http://patchwork.ozlabs.org/patch/554164/ My bad, I completely overlooked it, even though I was in Cc of this patch. I acked it, could you apply it before my series so that I can can adjust the bcma patch? Best Regards, Boris
diff --git a/drivers/mtd/nand/bcm47xxnflash/main.c b/drivers/mtd/nand/bcm47xxnflash/main.c index 9ba0c0f..4a07e56 100644 --- a/drivers/mtd/nand/bcm47xxnflash/main.c +++ b/drivers/mtd/nand/bcm47xxnflash/main.c @@ -55,15 +55,16 @@ static int bcm47xxnflash_probe(struct platform_device *pdev) return err; } + platform_set_drvdata(pdev, b47n); + return 0; } static int bcm47xxnflash_remove(struct platform_device *pdev) { - struct bcma_nflash *nflash = dev_get_platdata(&pdev->dev); + struct bcm47xxnflash *b47n = platform_get_drvdata(pdev); - if (nflash->mtd) - mtd_device_unregister(nflash->mtd); + nand_release(nand_to_mtd(&b47n->nand_chip)); return 0; } diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index cf03843..3015432 100644 --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h @@ -592,13 +592,9 @@ struct bcma_sflash { #endif #ifdef CONFIG_BCMA_NFLASH -struct mtd_info; - struct bcma_nflash { bool present; bool boot; /* This is the flash the SoC boots from */ - - struct mtd_info *mtd; }; #endif
bcm47xxnflash_remove() is supposed to unregister the NAND device previously registered in bcm47xxnflash_probe(), but the current implementation just test for the always NULL ->mtd platform data field (and does not call the right function to unregister it). Kill the useless ->mtd field in struct bcma_nflash, and release the real NAND device in bcm47xxnflash_remove(). Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Fixes: a5401370c520 ("mtd: prepare place for BCMA NAND flash driver(s)") Cc: Rafał Miłecki <zajec5@gmail.com> --- drivers/mtd/nand/bcm47xxnflash/main.c | 7 ++++--- include/linux/bcma/bcma_driver_chipcommon.h | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-)