Commit 55b61fec authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Rename device_is_compatible to of_device_is_compatible 



for consistency with other Open Firmware interfaces (and Sparc).

This is just a straight replacement.

This leaves the compatibility define in place.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d9333afd

arch/powerpc/kernel/legacy_serial.c

+7 −7
Original line number Diff line number Diff line
@@ -243,9 +243,9 @@ static int __init add_legacy_pci_port(struct device_node *np, 
	 * doesn't work for these settings, you'll have to add your own special

	 * cases here

	 */

	if (device_is_compatible(pci_dev, "pci13a8,152") ||

	    device_is_compatible(pci_dev, "pci13a8,154") ||

	    device_is_compatible(pci_dev, "pci13a8,158")) {

	if (of_device_is_compatible(pci_dev, "pci13a8,152") ||

	    of_device_is_compatible(pci_dev, "pci13a8,154") ||

	    of_device_is_compatible(pci_dev, "pci13a8,158")) {

		addr += 0x200 * lindex;

		base += 0x200 * lindex;

	} else {
@@ -364,11 +364,11 @@ void __init find_legacy_serial_ports(void) 
		/* Check for known pciclass, and also check wether we have

		 * a device with child nodes for ports or not

		 */

		if (device_is_compatible(np, "pciclass,0700") ||

		    device_is_compatible(np, "pciclass,070002"))

		if (of_device_is_compatible(np, "pciclass,0700") ||

		    of_device_is_compatible(np, "pciclass,070002"))

			pci = np;

		else if (device_is_compatible(parent, "pciclass,0700") ||

			 device_is_compatible(parent, "pciclass,070002"))

		else if (of_device_is_compatible(parent, "pciclass,0700") ||

			 of_device_is_compatible(parent, "pciclass,070002"))

			pci = parent;

		else {

			of_node_put(parent);

arch/powerpc/kernel/of_device.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ const struct of_device_id *of_match_node(const struct of_device_id *matches, 
			match &= node->type

				&& !strcmp(matches->type, node->type);

		if (matches->compatible[0])

			match &= device_is_compatible(node,

			match &= of_device_is_compatible(node,

						      matches->compatible);

		if (match)

			return matches;

arch/powerpc/kernel/vio.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static const struct vio_device_id *vio_match_device( 
{

	while (ids->type[0] != '\0') {

		if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&

		    device_is_compatible(dev->dev.archdata.of_node,

		    of_device_is_compatible(dev->dev.archdata.of_node,

					 ids->compat))

			return ids;

		ids++;

arch/powerpc/platforms/85xx/mpc8544_ds.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void __init mpc8544_ds_pic_init(void) 
#ifdef CONFIG_PPC_I8259

	/* Initialize the i8259 controller */

	for_each_node_by_type(np, "interrupt-controller")

	    if (device_is_compatible(np, "chrp,iic")) {

	    if (of_device_is_compatible(np, "chrp,iic")) {

		cascade_node = np;

		break;

	}

arch/powerpc/platforms/85xx/mpc85xx_cds.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static void __init mpc85xx_cds_pic_init(void) 
#ifdef CONFIG_PPC_I8259

	/* Initialize the i8259 controller */

	for_each_node_by_type(np, "interrupt-controller")

		if (device_is_compatible(np, "chrp,iic")) {

		if (of_device_is_compatible(np, "chrp,iic")) {

			cascade_node = np;

			break;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE