Skip to content

Commit 98d4fda

Browse files
committed
Merge tag 'nand/for-6.8' into mtd/next
* Raw NAND The most meaningful change being the conversion of the brcmnand driver to the ->exec_op() API, this series brought additional changes to the core in order to help controller drivers to handle themselves the WP pin during destructive operations when relevant. As always, there is as well a whole bunch of miscellaneous W=1 fixes, together with a few runtime fixes (double free, timeout value, OOB layout, missing register initialization) and the usual load of remove callbacks turned into void (which led to switch the txx9ndfmc driver to use module_platform_driver()).
2 parents 6762966 + 023e6aa commit 98d4fda

16 files changed

+225
-262
lines changed

drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ MODULE_DEVICE_TABLE(of, bcm63138_nand_of_match);
8585

8686
static struct platform_driver bcm63138_nand_driver = {
8787
.probe = bcm63138_nand_probe,
88-
.remove = brcmnand_remove,
88+
.remove_new = brcmnand_remove,
8989
.driver = {
9090
.name = "bcm63138_nand",
9191
.pm = &brcmnand_pm_ops,

drivers/mtd/nand/raw/brcmnand/bcm6368_nand.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ MODULE_DEVICE_TABLE(of, bcm6368_nand_of_match);
117117

118118
static struct platform_driver bcm6368_nand_driver = {
119119
.probe = bcm6368_nand_probe,
120-
.remove = brcmnand_remove,
120+
.remove_new = brcmnand_remove,
121121
.driver = {
122122
.name = "bcm6368_nand",
123123
.pm = &brcmnand_pm_ops,

drivers/mtd/nand/raw/brcmnand/bcma_nand.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ static int brcmnand_bcma_nand_probe(struct platform_device *pdev)
119119

120120
static struct platform_driver brcmnand_bcma_nand_driver = {
121121
.probe = brcmnand_bcma_nand_probe,
122-
.remove = brcmnand_remove,
122+
.remove_new = brcmnand_remove,
123123
.driver = {
124124
.name = "bcma_brcmnand",
125125
.pm = &brcmnand_pm_ops,

0 commit comments

Comments
 (0)