Commit 00e38efd authored by Grant Likely's avatar Grant Likely
Browse files

of/flattree: Merge of_flat_dt_is_compatible 



Merge common code between PowerPC and Microblaze

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Reviewed-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Tested-by: default avatarMichal Simek <monstr@monstr.eu>
parent ca900cfa

arch/microblaze/kernel/prom.c

+0 −19
Original line number Diff line number Diff line
@@ -50,25 +50,6 @@ typedef u32 cell_t; 
/* export that to outside world */

struct device_node *of_chosen;



int __init of_flat_dt_is_compatible(unsigned long node, const char *compat)

{

	const char *cp;

	unsigned long cplen, l;



	cp = of_get_flat_dt_prop(node, "compatible", &cplen);

	if (cp == NULL)

		return 0;

	while (cplen > 0) {

		if (strncasecmp(cp, compat, strlen(compat)) == 0)

			return 1;

		l = strlen(cp) + 1;

		cp += l;

		cplen -= l;

	}



	return 0;

}



static void *__init unflatten_dt_alloc(unsigned long *mem, unsigned long size,

					unsigned long align)

{

arch/powerpc/kernel/prom.c

+0 −19
Original line number Diff line number Diff line
@@ -80,25 +80,6 @@ extern rwlock_t devtree_lock; /* temporary while merging */ 
/* export that to outside world */

struct device_node *of_chosen;



int __init of_flat_dt_is_compatible(unsigned long node, const char *compat)

{

	const char* cp;

	unsigned long cplen, l;



	cp = of_get_flat_dt_prop(node, "compatible", &cplen);

	if (cp == NULL)

		return 0;

	while (cplen > 0) {

		if (strncasecmp(cp, compat, strlen(compat)) == 0)

			return 1;

		l = strlen(cp) + 1;

		cp += l;

		cplen -= l;

	}



	return 0;

}



static void *__init unflatten_dt_alloc(unsigned long *mem, unsigned long size,

				       unsigned long align)

{

drivers/of/fdt.c

+24 −0
Original line number Diff line number Diff line
@@ -142,3 +142,27 @@ void *__init of_get_flat_dt_prop(unsigned long node, const char *name, 
	} while (1);

}



/**

 * of_flat_dt_is_compatible - Return true if given node has compat in compatible list

 * @node: node to test

 * @compat: compatible string to compare with compatible list.

 */

int __init of_flat_dt_is_compatible(unsigned long node, const char *compat)

{

	const char *cp;

	unsigned long cplen, l;



	cp = of_get_flat_dt_prop(node, "compatible", &cplen);

	if (cp == NULL)

		return 0;

	while (cplen > 0) {

		if (strncasecmp(cp, compat, strlen(compat)) == 0)

			return 1;

		l = strlen(cp) + 1;

		cp += l;

		cplen -= l;

	}



	return 0;

}