mtd: rawnand: ndfc: use devm_platform_ioremap_resource
Subsystems (3)
PATCH 1/1 mtd: rawnand: ndfc: use devm_platform_ioremap_resource
Replace the open-coded of_iomap()/iounmap() with the managed devm_platform_ioremap_resource() helper. This fixes a mapping leak on probe failure and on driver remove (the old code never called iounmap()) and simplifies the error path by dropping the manual cleanup in ndfc_probe().
There is no overlapping memory-region concern introduced by this
change: each supported board DT describes a single ndfc node with a unique 0x2000 register region, and the EBC parent uses dcr-reg rather than a MEM reg resource, so the newly added request_mem_region() cannot conflict with an existing reservation. Distinct chip selects map to distinct 64-bit physical addresses, so CS instances do not overlap.
--- drivers/mtd/nand/raw/ndfc.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/mtd/nand/raw/ndfc.c +7 -12
@@ -185,11 +185,16 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,static int ndfc_probe (struct platform_device *ofdev) {struct ndfc_controller *ndfc; +void __iomem *ndfcbase;const __be32 *reg;u32 ccr;u32 cs;int err, len =0 ; + ndfcbase =devm_platform_ioremap_resource (ofdev,0 ); +if (IS_ERR (ndfcbase)) +return PTR_ERR (ndfcbase); +/* Read the reg property to get the chip select */ reg =of_get_property (ofdev->dev.of_node,"reg" , &len);if (reg ==NULL || len !=12 ) {
@@ -210,11 +215,7 @@ static int ndfc_probe(struct platform_device *ofdev) ndfc->ofdev = ofdev;dev_set_drvdata (&ofdev->dev, ndfc); - ndfc->ndfcbase =of_iomap (ofdev->dev.of_node,0 ); -if (!ndfc->ndfcbase) { -dev_err (&ofdev->dev,"failed to get memory\n" ); -return -EIO ; - } + ndfc->ndfcbase = ndfcbase; ccr =NDFC_CCR_BS (ndfc->chip_select);
@@ -232,13 +233,7 @@ static int ndfc_probe(struct platform_device *ofdev)iowrite32be (be32_to_cpup (reg), ndfc->ndfcbase + offset); } - err =ndfc_chip_init (ndfc, ofdev->dev.of_node); -if (err) { -iounmap (ndfc->ndfcbase); -return err; - } - -return 0 ; +return ndfc_chip_init (ndfc, ofdev->dev.of_node); }static void ndfc_remove (struct platform_device *ofdev)
Signature · 1 line
2.55.0
Quoted 5 lines
Replace the open-coded of_iomap()/iounmap() with the managed
devm_platform_ioremap_resource()helper. This fixes a mapping leak on probe failure and on driver remove (the old code never callediounmap()) and simplifies the error path by dropping the manual cleanup inndfc_probe().
…
Quoted 2 lines
--- drivers/mtd/nand/raw/ndfc.c | 19 +++++++------------
…
How do you think about to add any tags (like “Fixes” and “Cc”) accordingly?
See also:
* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v7.2#n145
* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst?h=v7.2#n34
Would it be helpful to append parentheses also to a function name in the summary phrase?
Regards,
Markus
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Rosen,
kernel test robot noticed the following build warnings:
[auto build test WARNING on v7.2]
[also build test WARNING on linus/master next-20260821] [cannot apply to mtd/nand/next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Rosen-Penev/mtd-rawnand-ndfc-use-devm_platform_ioremap_resource/20260822-154150 base: v7.2 patch link: https://lore.kernel.org/r/20260822224150.198749-1-rosenp%40gmail.com patch subject: [PATCH] mtd: rawnand: ndfc: use devm_platform_ioremap_resource config: nios2-allmodconfig (https://download.01.org/0day-ci/archive/20260825/[email protected]/config) compiler: nios2-linux-gcc (GCC) 11.5.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260825/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
drivers/mtd/nand/raw/ndfc.c: In function 'ndfc_probe':
>> drivers/mtd/nand/raw/ndfc.c:192:13: warning: unused variable 'err' [-Wunused-variable]
192 | int err, len = 0;
| ^~~vim +/err +192 drivers/mtd/nand/raw/ndfc.c
ce4c61f1848649 drivers/mtd/nand/ndfc.c Thomas Gleixner 2006-05-23 184
06f25510692385 drivers/mtd/nand/ndfc.c Bill Pemberton 2012-11-19 185 static int ndfc_probe(struct platform_device *ofdev)
ce4c61f1848649 drivers/mtd/nand/ndfc.c Thomas Gleixner 2006-05-23 186 {
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 187 struct ndfc_controller *ndfc;
dcd80db3efa82b drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-08-22 188 void __iomem *ndfcbase;
766f271a63d1ee drivers/mtd/nand/ndfc.c Ian Munsie 2010-10-01 189 const __be32 *reg;
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 190 u32 ccr;
5828c60826e942 drivers/mtd/nand/ndfc.c Dan Carpenter 2014-07-31 191 u32 cs;
cceca8cb776b03 drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-06-13 @192 int err, len = 0;
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 193
dcd80db3efa82b drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-08-22 194 ndfcbase = devm_platform_ioremap_resource(ofdev, 0);
dcd80db3efa82b drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-08-22 195 if (IS_ERR(ndfcbase))
dcd80db3efa82b drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-08-22 196 return PTR_ERR(ndfcbase);
dcd80db3efa82b drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-08-22 197
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 198 /* Read the reg property to get the chip select */
61c7a080a5a061 drivers/mtd/nand/ndfc.c Grant Likely 2010-04-13 199 reg = of_get_property(ofdev->dev.of_node, "reg", &len);
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 200 if (reg == NULL || len != 12) {
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 201 dev_err(&ofdev->dev, "unable read reg property (%d)\n", len);
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 202 return -ENOENT;
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 203 }
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 204
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 205 cs = be32_to_cpu(reg[0]);
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 206 if (cs >= NDFC_MAX_CS) {
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 207 dev_err(&ofdev->dev, "invalid CS number (%d)\n", cs);
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 208 return -EINVAL;
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 209 }
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 210
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 211 ndfc = &ndfc_ctrl[cs];
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 212 ndfc->chip_select = cs;
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 213
7da45139d264f3 drivers/mtd/nand/raw/ndfc.c Miquel Raynal 2018-07-17 214 nand_controller_init(&ndfc->ndfc_control);
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 215 ndfc->ofdev = ofdev;
410fe2f02630fa drivers/mtd/nand/ndfc.c Felix Radensky 2011-04-26 216 dev_set_drvdata(&ofdev->dev, ndfc);
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 217
dcd80db3efa82b drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-08-22 218 ndfc->ndfcbase = ndfcbase;
ce4c61f1848649 drivers/mtd/nand/ndfc.c Thomas Gleixner 2006-05-23 219
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 220 ccr = NDFC_CCR_BS(ndfc->chip_select);
ce4c61f1848649 drivers/mtd/nand/ndfc.c Thomas Gleixner 2006-05-23 221
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 222 /* It is ok if ccr does not exist - just default to 0 */
61c7a080a5a061 drivers/mtd/nand/ndfc.c Grant Likely 2010-04-13 223 reg = of_get_property(ofdev->dev.of_node, "ccr", NULL);
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 224 if (reg)
766f271a63d1ee drivers/mtd/nand/ndfc.c Ian Munsie 2010-10-01 225 ccr |= be32_to_cpup(reg);
ce4c61f1848649 drivers/mtd/nand/ndfc.c Thomas Gleixner 2006-05-23 226
4f2692a5383e4b drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-06-01 227 iowrite32be(ccr, ndfc->ndfcbase + NDFC_CCR);
ce4c61f1848649 drivers/mtd/nand/ndfc.c Thomas Gleixner 2006-05-23 228
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 229 /* Set the bank settings if given */
61c7a080a5a061 drivers/mtd/nand/ndfc.c Grant Likely 2010-04-13 230 reg = of_get_property(ofdev->dev.of_node, "bank-settings", NULL);
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 231 if (reg) {
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 232 int offset = NDFC_BCFG0 + (ndfc->chip_select << 2);
4f2692a5383e4b drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-06-01 233 iowrite32be(be32_to_cpup(reg), ndfc->ndfcbase + offset);
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 234 }
a808ad3b0d2841 drivers/mtd/nand/ndfc.c Sean MacLennan 2008-12-10 235
dcd80db3efa82b drivers/mtd/nand/raw/ndfc.c Rosen Penev 2026-08-22 236 return ndfc_chip_init(ndfc, ofdev->dev.of_node);
ce4c61f1848649 drivers/mtd/nand/ndfc.c Thomas Gleixner 2006-05-23 237 }
ce4c61f1848649 drivers/mtd/nand/ndfc.c Thomas Gleixner 2006-05-23 238 --
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki