[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 <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:

committed by
Paul Mackerras

parent
d9333afd6a
commit
55b61fec22
@@ -606,7 +606,7 @@ static void smu_expose_childs(struct work_struct *unused)
|
||||
struct device_node *np;
|
||||
|
||||
for (np = NULL; (np = of_get_next_child(smu->of_node, np)) != NULL;)
|
||||
if (device_is_compatible(np, "smu-sensors"))
|
||||
if (of_device_is_compatible(np, "smu-sensors"))
|
||||
of_platform_device_create(np, "smu-sensors",
|
||||
&smu->of_dev->dev);
|
||||
}
|
||||
|
@@ -560,9 +560,9 @@ thermostat_init(void)
|
||||
np = of_find_node_by_name(NULL, "fan");
|
||||
if (!np)
|
||||
return -ENODEV;
|
||||
if (device_is_compatible(np, "adt7460"))
|
||||
if (of_device_is_compatible(np, "adt7460"))
|
||||
therm_type = ADT7460;
|
||||
else if (device_is_compatible(np, "adt7467"))
|
||||
else if (of_device_is_compatible(np, "adt7467"))
|
||||
therm_type = ADT7467;
|
||||
else
|
||||
return -ENODEV;
|
||||
|
@@ -310,14 +310,14 @@ int __init find_via_pmu(void)
|
||||
PMU_INT_TICK;
|
||||
|
||||
if (vias->parent->name && ((strcmp(vias->parent->name, "ohare") == 0)
|
||||
|| device_is_compatible(vias->parent, "ohare")))
|
||||
|| of_device_is_compatible(vias->parent, "ohare")))
|
||||
pmu_kind = PMU_OHARE_BASED;
|
||||
else if (device_is_compatible(vias->parent, "paddington"))
|
||||
else if (of_device_is_compatible(vias->parent, "paddington"))
|
||||
pmu_kind = PMU_PADDINGTON_BASED;
|
||||
else if (device_is_compatible(vias->parent, "heathrow"))
|
||||
else if (of_device_is_compatible(vias->parent, "heathrow"))
|
||||
pmu_kind = PMU_HEATHROW_BASED;
|
||||
else if (device_is_compatible(vias->parent, "Keylargo")
|
||||
|| device_is_compatible(vias->parent, "K2-Keylargo")) {
|
||||
else if (of_device_is_compatible(vias->parent, "Keylargo")
|
||||
|| of_device_is_compatible(vias->parent, "K2-Keylargo")) {
|
||||
struct device_node *gpiop;
|
||||
struct device_node *adbp;
|
||||
u64 gaddr = OF_BAD_ADDR;
|
||||
|
@@ -188,10 +188,10 @@ static int wf_lm75_attach(struct i2c_adapter *adapter)
|
||||
if (loc == NULL || addr == 0)
|
||||
continue;
|
||||
/* real lm75 */
|
||||
if (device_is_compatible(dev, "lm75"))
|
||||
if (of_device_is_compatible(dev, "lm75"))
|
||||
wf_lm75_create(adapter, addr, 0, loc);
|
||||
/* ds1775 (compatible, better resolution */
|
||||
else if (device_is_compatible(dev, "ds1775"))
|
||||
else if (of_device_is_compatible(dev, "ds1775"))
|
||||
wf_lm75_create(adapter, addr, 1, loc);
|
||||
}
|
||||
return 0;
|
||||
|
@@ -131,7 +131,7 @@ static int wf_max6690_attach(struct i2c_adapter *adapter)
|
||||
*/
|
||||
if (!pmac_i2c_match_adapter(dev, adapter))
|
||||
continue;
|
||||
if (!device_is_compatible(dev, "max6690"))
|
||||
if (!of_device_is_compatible(dev, "max6690"))
|
||||
continue;
|
||||
addr = pmac_i2c_get_dev_addr(dev);
|
||||
loc = of_get_property(dev, "hwsensor-location", NULL);
|
||||
|
@@ -263,7 +263,7 @@ static int __init smu_controls_init(void)
|
||||
/* Look for RPM fans */
|
||||
for (fans = NULL; (fans = of_get_next_child(smu, fans)) != NULL;)
|
||||
if (!strcmp(fans->name, "rpm-fans") ||
|
||||
device_is_compatible(fans, "smu-rpm-fans"))
|
||||
of_device_is_compatible(fans, "smu-rpm-fans"))
|
||||
break;
|
||||
for (fan = NULL;
|
||||
fans && (fan = of_get_next_child(fans, fan)) != NULL;) {
|
||||
|
@@ -380,7 +380,7 @@ static int wf_sat_attach(struct i2c_adapter *adapter)
|
||||
busnode = pmac_i2c_get_bus_node(bus);
|
||||
|
||||
while ((dev = of_get_next_child(busnode, dev)) != NULL)
|
||||
if (device_is_compatible(dev, "smu-sat"))
|
||||
if (of_device_is_compatible(dev, "smu-sat"))
|
||||
wf_sat_create(adapter, dev);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user