[POWERPC] Rename device_is_compatible to of_device_is_compatible
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=55b61fec22caa3e7872caea6c4100fc75cb8f49b
Commit: 55b61fec22caa3e7872caea6c4100fc75cb8f49b
Parent: d9333afd6a714760c13f76ba275a32ec7bd979c1
Author: Stephen Rothwell [EMAIL PROTECTED]
AuthorDate: Thu May 3 17:26:52 2007 +1000
Committer: Paul Mackerras [EMAIL PROTECTED]
CommitDate: Mon May 7 20:31:14 2007 +1000
[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: Stephen Rothwell [EMAIL PROTECTED]
Signed-off-by: Paul Mackerras [EMAIL PROTECTED]
---
arch/powerpc/kernel/legacy_serial.c | 14 ++--
arch/powerpc/kernel/of_device.c |2 +-
arch/powerpc/kernel/vio.c |2 +-
arch/powerpc/platforms/85xx/mpc8544_ds.c|2 +-
arch/powerpc/platforms/85xx/mpc85xx_cds.c |2 +-
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c |2 +-
arch/powerpc/platforms/cell/interrupt.c |6 ++--
arch/powerpc/platforms/cell/setup.c |2 +-
arch/powerpc/platforms/cell/spider-pic.c|4 +-
arch/powerpc/platforms/chrp/pci.c |2 +-
arch/powerpc/platforms/chrp/setup.c |2 +-
arch/powerpc/platforms/maple/pci.c | 12 +-
arch/powerpc/platforms/maple/setup.c|2 +-
arch/powerpc/platforms/pasemi/setup.c |2 +-
arch/powerpc/platforms/powermac/feature.c | 26 +++---
arch/powerpc/platforms/powermac/low_i2c.c |2 +-
arch/powerpc/platforms/powermac/nvram.c |4 +-
arch/powerpc/platforms/powermac/pci.c | 30 +-
arch/powerpc/platforms/powermac/pic.c |2 +-
arch/powerpc/platforms/powermac/setup.c |4 +-
arch/powerpc/platforms/powermac/smp.c |6 ++--
arch/powerpc/platforms/pseries/lpar.c |4 +-
arch/powerpc/platforms/pseries/setup.c |2 +-
arch/powerpc/platforms/pseries/xics.c |4 +-
arch/powerpc/sysdev/uic.c |2 +-
drivers/char/hvc_iseries.c |2 +-
drivers/char/hvc_vio.c |2 +-
drivers/char/tpm/tpm_atmel.h|2 +-
drivers/hwmon/ams/ams-core.c|4 +-
drivers/ide/pci/pdc202xx_new.c |2 +-
drivers/ide/ppc/pmac.c | 14 ++--
drivers/macintosh/smu.c |2 +-
drivers/macintosh/therm_adt746x.c |4 +-
drivers/macintosh/via-pmu.c | 10
drivers/macintosh/windfarm_lm75_sensor.c|4 +-
drivers/macintosh/windfarm_max6690_sensor.c |2 +-
drivers/macintosh/windfarm_smu_controls.c |2 +-
drivers/macintosh/windfarm_smu_sat.c|2 +-
drivers/serial/pmac_zilog.c |2 +-
drivers/usb/host/ohci-ppc-of.c |4 +-
drivers/video/offb.c|4 +-
sound/aoa/codecs/snd-aoa-codec-onyx.c |4 +-
sound/aoa/codecs/snd-aoa-codec-tas.c|2 +-
sound/aoa/soundbus/i2sbus/i2sbus-core.c |4 +-
sound/oss/dmasound/dmasound_awacs.c | 16 +++---
sound/ppc/pmac.c| 14 ++--
sound/ppc/tumbler.c |2 +-
47 files changed, 123 insertions(+), 123 deletions(-)
diff --git a/arch/powerpc/kernel/legacy_serial.c
b/arch/powerpc/kernel/legacy_serial.c
index 63dd2c3..662cd67 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -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
[POWERPC] Rename device_is_compatible to of_device_is_compatible
Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7a92f74f98bde8498c98aad6cac5da5a87dd0bf4
Commit: 7a92f74f98bde8498c98aad6cac5da5a87dd0bf4
Parent: 0e56efc7dcd1eb5004363e52bdbe801783245638
Author: Stephen Rothwell [EMAIL PROTECTED]
AuthorDate: Tue Apr 3 10:55:39 2007 +1000
Committer: Paul Mackerras [EMAIL PROTECTED]
CommitDate: Fri Apr 13 03:55:18 2007 +1000
[POWERPC] Rename device_is_compatible to of_device_is_compatible
This is more consistent and gets us closer to the Sparc code.
We add a device_is_compatible define for compatibility during the
change over.
Signed-off-by: Stephen Rothwell [EMAIL PROTECTED]
Signed-off-by: Paul Mackerras [EMAIL PROTECTED]
---
arch/powerpc/kernel/prom.c | 11 ++-
include/asm-powerpc/prom.h |3 ++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 6224728..d2840b6 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1131,7 +1131,8 @@ EXPORT_SYMBOL(find_all_nodes);
/** Checks if the given compat string matches one of the strings in
* the device's compatible property
*/
-int device_is_compatible(const struct device_node *device, const char *compat)
+int of_device_is_compatible(const struct device_node *device,
+ const char *compat)
{
const char* cp;
int cplen, l;
@@ -1149,7 +1150,7 @@ int device_is_compatible(const struct device_node
*device, const char *compat)
return 0;
}
-EXPORT_SYMBOL(device_is_compatible);
+EXPORT_SYMBOL(of_device_is_compatible);
/**
@@ -1163,7 +1164,7 @@ int machine_is_compatible(const char *compat)
root = of_find_node_by_path(/);
if (root) {
- rc = device_is_compatible(root, compat);
+ rc = of_device_is_compatible(root, compat);
of_node_put(root);
}
return rc;
@@ -1184,7 +1185,7 @@ struct device_node *find_compatible_devices(const char
*type,
if (type != NULL
!(np-type != 0 strcasecmp(np-type, type) == 0))
continue;
- if (device_is_compatible(np, compat)) {
+ if (of_device_is_compatible(np, compat)) {
*prevp = np;
prevp = np-next;
}
@@ -1300,7 +1301,7 @@ struct device_node *of_find_compatible_node(struct
device_node *from,
if (type != NULL
!(np-type != 0 strcasecmp(np-type, type) == 0))
continue;
- if (device_is_compatible(np, compatible) of_node_get(np))
+ if (of_device_is_compatible(np, compatible) of_node_get(np))
break;
}
of_node_put(from);
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index 448c5ce..fcacc88 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -162,8 +162,9 @@ extern void of_detach_node(const struct device_node *);
extern void finish_device_tree(void);
extern void unflatten_device_tree(void);
extern void early_init_devtree(void *);
-extern int device_is_compatible(const struct device_node *device,
+extern int of_device_is_compatible(const struct device_node *device,
const char *);
+#define device_is_compatible(d, c) of_device_is_compatible((d), (c))
extern int machine_is_compatible(const char *compat);
extern const void *of_get_property(const struct device_node *node,
const char *name,
-
To unsubscribe from this list: send the line unsubscribe git-commits-head in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
