diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-12-08 17:04:59 -0800 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-12-14 10:11:09 -0800 |
| commit | 665d2c2848f14c0c2a2e89192bde9073c4d352f7 (patch) | |
| tree | e1189b714c9def12adfb5d6dc4540549583a4b55 /include | |
| parent | 320092a05dab2f44819c42f33d6b51efb6c474f2 (diff) | |
| download | linux-665d2c2848f14c0c2a2e89192bde9073c4d352f7.tar.bz2 | |
mtd: bcm47xxnflash: really unregister NAND on device removal
The field bcma_nflash::mtd is never set to be non-zero anywhere, but we
test for it in the removal path. So the MTD is never unregistered.
Also, we should use nand_release(), not mtd_device_unregister().
Finally, we don't need to use the 'platdata' for stashing/retrieving our
*driver* data -- that's what *_{get,set}_drvdata() are for.
So, kill off bcm_nflash::mtd, and stash the struct bcm47xxnflash in
drvdata instead. Also move the forward declaration of mtd_info up a bit,
since struct bcma_sflash should be using it.
Caught while inspecting other changes being made to this driver. Compile
tested only.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: "Rafał Miłecki" <zajec5@gmail.com>
Cc: linux-wireless@vger.kernel.org
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bcma/bcma_driver_chipcommon.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h index cf038431a5cc..db51a6ffb7d6 100644 --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h @@ -579,6 +579,8 @@ struct bcma_pflash { }; #ifdef CONFIG_BCMA_SFLASH +struct mtd_info; + struct bcma_sflash { bool present; u32 window; @@ -592,13 +594,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 |