Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 375da3a7 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds
Browse files

drivers/of/fdt.c: re-use kernel's kbasename() 



Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b2e902f0

drivers/of/fdt.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -488,14 +488,8 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node, 
		depth++;

		depth++;

		pathp = (char *)p;

		pathp = (char *)p;

		p = ALIGN(p + strlen(pathp) + 1, 4);

		p = ALIGN(p + strlen(pathp) + 1, 4);

		if ((*pathp) == '/') {

		if (*pathp == '/')

			const char *lp, *np;

			pathp = kbasename(pathp);

			for (lp = NULL, np = pathp; *np; np++)

				if ((*np) == '/')

					lp = np+1;

			if (lp != NULL)

				pathp = lp;

		}

		rc = it(p, pathp, depth, data);

		rc = it(p, pathp, depth, data);

		if (rc != 0)

		if (rc != 0)

			break;

			break;