Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "[POWERPC] Rename get_property to of_get_property: drivers"

Browse source 
This reverts commit d05c7a80cf,
which included changes which should go via other subsystem
maintainers.
This commit is contained in:
Paul Mackerras 2007-04-26 22:24:31 +10:00
parent 0999ed7f57
commit a48141db68
50 changed files with 120 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/ata/sata_svw.c
View file

@ -297,7 +297,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
/* Match it to a port node */ /* Match it to a port node */
index = (ap == ap->host->ports[0]) ? 0 : 1; index = (ap == ap->host->ports[0]) ? 0 : 1;
for (np = np->child; np != NULL; np = np->sibling) { for (np = np->child; np != NULL; np = np->sibling) {
const u32 *reg = of_get_property(np, "reg", NULL); const u32 *reg = get_property(np, "reg", NULL);
if (!reg) if (!reg)
continue; continue;
if (index == *reg) if (index == *reg)

2
drivers/char/agp/uninorth-agp.c
View file

@ -613,7 +613,7 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
uninorth_node = of_find_node_by_name(NULL, "u3"); uninorth_node = of_find_node_by_name(NULL, "u3");
} }
if (uninorth_node) { if (uninorth_node) {
const int *revprop = of_get_property(uninorth_node, const int *revprop = get_property(uninorth_node,
"device-rev", NULL); "device-rev", NULL);
if (revprop != NULL) if (revprop != NULL)
uninorth_rev = *revprop & 0x3f; uninorth_rev = *revprop & 0x3f;

2
drivers/char/briq_panel.c
View file

@ -206,7 +206,7 @@ static int __init briq_panel_init(void)
const char *machine; const char *machine;
int i; int i;
machine = of_get_property(root, "model", NULL); machine = get_property(root, "model", NULL);
if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) { if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) {
of_node_put(root); of_node_put(root);
return -ENODEV; return -ENODEV;

2
drivers/char/hvc_iseries.c
View file

@ -575,7 +575,7 @@ static int hvc_find_vtys(void)
(num_found >= VTTY_PORTS)) (num_found >= VTTY_PORTS))
break; break;
vtermno = of_get_property(vty, "reg", NULL); vtermno = get_property(vty, "reg", NULL);
if (!vtermno) if (!vtermno)
continue; continue;

2
drivers/char/hvc_vio.c
View file

@ -153,7 +153,7 @@ static int hvc_find_vtys(void)
if (num_found >= MAX_NR_HVC_CONSOLES) if (num_found >= MAX_NR_HVC_CONSOLES)
break; break;
vtermno = of_get_property(vty, "reg", NULL); vtermno = get_property(vty, "reg", NULL);
if (!vtermno) if (!vtermno)
continue; continue;

4
drivers/char/hvsi.c
View file

@ -1279,8 +1279,8 @@ static int __init hvsi_console_init(void)
struct hvsi_struct *hp; struct hvsi_struct *hp;
const uint32_t *vtermno, *irq; const uint32_t *vtermno, *irq;
vtermno = of_get_property(vty, "reg", NULL); vtermno = get_property(vty, "reg", NULL);
irq = of_get_property(vty, "interrupts", NULL); irq = get_property(vty, "interrupts", NULL);
if (!vtermno || !irq) if (!vtermno || !irq)
continue; continue;

2
drivers/char/tpm/tpm_atmel.h
View file

@ -52,7 +52,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size)
return NULL; return NULL;
} }
reg = of_get_property(dn, "reg", &reglen); reg = get_property(dn, "reg", &reglen);
naddrc = of_n_addr_cells(dn); naddrc = of_n_addr_cells(dn);
nsizec = of_n_size_cells(dn); nsizec = of_n_size_cells(dn);

2
drivers/hwmon/ams/ams-core.c
View file

@ -144,7 +144,7 @@ int ams_sensor_attach(void)
const u32 *prop; const u32 *prop;
/* Get orientation */ /* Get orientation */
prop = of_get_property(ams_info.of_node, "orientation", NULL); prop = get_property(ams_info.of_node, "orientation", NULL);
if (!prop) if (!prop)
return -ENODEV; return -ENODEV;
ams_info.orient1 = *prop; ams_info.orient1 = *prop;

2
drivers/hwmon/ams/ams-i2c.c
View file

@ -276,7 +276,7 @@ int __init ams_i2c_init(struct device_node *np)
ams_info.bustype = BUS_I2C; ams_info.bustype = BUS_I2C;
/* look for bus either using "reg" or by path */ /* look for bus either using "reg" or by path */
prop = of_get_property(ams_info.of_node, "reg", NULL); prop = get_property(ams_info.of_node, "reg", NULL);
if (!prop) { if (!prop) {
result = -ENODEV; result = -ENODEV;

2
drivers/hwmon/ams/ams-pmu.c
View file

@ -160,7 +160,7 @@ int __init ams_pmu_init(struct device_node *np)
ams_info.bustype = BUS_HOST; ams_info.bustype = BUS_HOST;
/* Get PMU command, should be 0x4e, but we can never know */ /* Get PMU command, should be 0x4e, but we can never know */
prop = of_get_property(ams_info.of_node, "reg", NULL); prop = get_property(ams_info.of_node, "reg", NULL);
if (!prop) { if (!prop) {
result = -ENODEV; result = -ENODEV;
goto exit; goto exit;

4
drivers/ide/ppc/pmac.c
View file

@ -1175,14 +1175,14 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
pmif->broken_dma = 1; pmif->broken_dma = 1;
} }
bidp = of_get_property(np, "AAPL,bus-id", NULL); bidp = get_property(np, "AAPL,bus-id", NULL);
pmif->aapl_bus_id = bidp ? *bidp : 0; pmif->aapl_bus_id = bidp ? *bidp : 0;
/* Get cable type from device-tree */ /* Get cable type from device-tree */
if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6 if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6
|| pmif->kind == controller_k2_ata6 || pmif->kind == controller_k2_ata6
|| pmif->kind == controller_sh_ata6) { || pmif->kind == controller_sh_ata6) {
const char* cable = of_get_property(np, "cable-type", NULL); const char* cable = get_property(np, "cable-type", NULL);
if (cable && !strncmp(cable, "80-", 3)) if (cable && !strncmp(cable, "80-", 3))
pmif->cable_80 = 1; pmif->cable_80 = 1;
} }

2
drivers/infiniband/hw/ehca/ehca_main.c
View file

@ -569,7 +569,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
struct ib_pd *ibpd; struct ib_pd *ibpd;
int ret; int ret;
handle = of_get_property(dev->ofdev.node, "ibm,hca-handle", NULL); handle = get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
if (!handle) { if (!handle) {
ehca_gen_err("Cannot get eHCA handle for adapter: %s.", ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
dev->ofdev.node->full_name); dev->ofdev.node->full_name);

2
drivers/macintosh/macio_asic.c
View file

@ -395,7 +395,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
#endif #endif
MAX_NODE_NAME_SIZE, np->name); MAX_NODE_NAME_SIZE, np->name);
} else { } else {
reg = of_get_property(np, "reg", NULL); reg = get_property(np, "reg", NULL);
sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s", sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",
chip->lbus.index, chip->lbus.index,
reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name); reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);

4
drivers/macintosh/macio_sysfs.c
View file

@ -21,7 +21,7 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
int length = 0; int length = 0;
of = &to_macio_device (dev)->ofdev; of = &to_macio_device (dev)->ofdev;
compat = of_get_property(of->node, "compatible", &cplen); compat = get_property(of->node, "compatible", &cplen);
if (!compat) { if (!compat) {
*buf = '\0'; *buf = '\0';
return 0; return 0;
@ -47,7 +47,7 @@ static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
int length; int length;
of = &to_macio_device (dev)->ofdev; of = &to_macio_device (dev)->ofdev;
compat = of_get_property(of->node, "compatible", &cplen); compat = get_property(of->node, "compatible", &cplen);
if (!compat) compat = "", cplen = 1; if (!compat) compat = "", cplen = 1;
length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type); length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
buf += length; buf += length;

2
drivers/macintosh/rack-meter.c
View file

@ -387,7 +387,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,
if (strcmp(np->name, "lightshow") == 0) if (strcmp(np->name, "lightshow") == 0)
break; break;
if ((strcmp(np->name, "sound") == 0) && if ((strcmp(np->name, "sound") == 0) &&
of_get_property(np, "virtual", NULL) != NULL) get_property(np, "virtual", NULL) != NULL)
break; break;
} }
if (np == NULL) { if (np == NULL) {

6
drivers/macintosh/smu.c
View file

@ -491,7 +491,7 @@ int __init smu_init (void)
printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n"); printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
goto fail; goto fail;
} }
data = of_get_property(smu->db_node, "reg", NULL); data = get_property(smu->db_node, "reg", NULL);
if (data == NULL) { if (data == NULL) {
of_node_put(smu->db_node); of_node_put(smu->db_node);
smu->db_node = NULL; smu->db_node = NULL;
@ -512,7 +512,7 @@ int __init smu_init (void)
smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt"); smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt");
if (smu->msg_node == NULL) if (smu->msg_node == NULL)
break; break;
data = of_get_property(smu->msg_node, "reg", NULL); data = get_property(smu->msg_node, "reg", NULL);
if (data == NULL) { if (data == NULL) {
of_node_put(smu->msg_node); of_node_put(smu->msg_node);
smu->msg_node = NULL; smu->msg_node = NULL;
@ -1004,7 +1004,7 @@ const struct smu_sdbp_header *__smu_get_sdb_partition(int id,
} else } else
mutex_lock(&smu_part_access); mutex_lock(&smu_part_access);
part = of_get_property(smu->of_node, pname, size); part = get_property(smu->of_node, pname, size);
if (part == NULL) { if (part == NULL) {
DPRINTK("trying to extract from SMU ...\n"); DPRINTK("trying to extract from SMU ...\n");
part = smu_create_sdb_partition(id); part = smu_create_sdb_partition(id);

8
drivers/macintosh/therm_adt746x.c
View file

@ -567,13 +567,13 @@ thermostat_init(void)
else else
return -ENODEV; return -ENODEV;
prop = of_get_property(np, "hwsensor-params-version", NULL); prop = get_property(np, "hwsensor-params-version", NULL);
printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop, printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop,
(*prop == 1)?"":"un"); (*prop == 1)?"":"un");
if (*prop != 1) if (*prop != 1)
return -ENODEV; return -ENODEV;
prop = of_get_property(np, "reg", NULL); prop = get_property(np, "reg", NULL);
if (!prop) if (!prop)
return -ENODEV; return -ENODEV;
@ -591,9 +591,9 @@ thermostat_init(void)
"limit_adjust: %d, fan_speed: %d\n", "limit_adjust: %d, fan_speed: %d\n",
therm_bus, therm_address, limit_adjust, fan_speed); therm_bus, therm_address, limit_adjust, fan_speed);
if (of_get_property(np, "hwsensor-location", NULL)) { if (get_property(np, "hwsensor-location", NULL)) {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
sensor_location[i] = of_get_property(np, sensor_location[i] = get_property(np,
"hwsensor-location", NULL) + offset; "hwsensor-location", NULL) + offset;
if (sensor_location[i] == NULL) if (sensor_location[i] == NULL)

8
drivers/macintosh/therm_pm72.c
View file

@ -674,7 +674,7 @@ static int read_eeprom(int cpu, struct mpu_data *out)
printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n"); printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n");
return -ENODEV; return -ENODEV;
} }
data = of_get_property(np, "cpuid", &len); data = get_property(np, "cpuid", &len);
if (data == NULL) { if (data == NULL) {
printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n"); printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n");
of_node_put(np); of_node_put(np);
@ -1337,7 +1337,7 @@ static int init_backside_state(struct backside_pid_state *state)
*/ */
u3 = of_find_node_by_path("/u3@0,f8000000"); u3 = of_find_node_by_path("/u3@0,f8000000");
if (u3 != NULL) { if (u3 != NULL) {
const u32 *vers = of_get_property(u3, "device-rev", NULL); const u32 *vers = get_property(u3, "device-rev", NULL);
if (vers) if (vers)
if (((*vers) & 0x3f) < 0x34) if (((*vers) & 0x3f) < 0x34)
u3h = 0; u3h = 0;
@ -2129,8 +2129,8 @@ static void fcu_lookup_fans(struct device_node *fcu_node)
continue; continue;
/* Lookup for a matching location */ /* Lookup for a matching location */
loc = of_get_property(np, "location", NULL); loc = get_property(np, "location", NULL);
reg = of_get_property(np, "reg", NULL); reg = get_property(np, "reg", NULL);
if (loc == NULL || reg == NULL) if (loc == NULL || reg == NULL)
continue; continue;
DBG(" matching location: %s, reg: 0x%08x\n", loc, *reg); DBG(" matching location: %s, reg: 0x%08x\n", loc, *reg);

2
drivers/macintosh/therm_windtunnel.c
View file

@ -492,7 +492,7 @@ g4fan_init( void )
if( !(np=of_find_node_by_name(NULL, "power-mgt")) ) if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
return -ENODEV; return -ENODEV;
info = of_get_property(np, "thermal-info", NULL); info = get_property(np, "thermal-info", NULL);
of_node_put(np); of_node_put(np);
if( !info || !machine_is_compatible("PowerMac3,6") ) if( !info || !machine_is_compatible("PowerMac3,6") )

2
drivers/macintosh/via-cuda.c
View file

@ -131,7 +131,7 @@ int __init find_via_cuda(void)
if (vias == 0) if (vias == 0)
return 0; return 0;
reg = of_get_property(vias, "reg", NULL); reg = get_property(vias, "reg", NULL);
if (reg == NULL) { if (reg == NULL) {
printk(KERN_ERR "via-cuda: No \"reg\" property !\n"); printk(KERN_ERR "via-cuda: No \"reg\" property !\n");
goto fail; goto fail;

2
drivers/macintosh/via-pmu-led.c
View file

@ -118,7 +118,7 @@ static int __init via_pmu_led_init(void)
dt = of_find_node_by_path("/"); dt = of_find_node_by_path("/");
if (dt == NULL) if (dt == NULL)
return -ENODEV; return -ENODEV;
model = of_get_property(dt, "model", NULL); model = get_property(dt, "model", NULL);
if (model == NULL) if (model == NULL)
return -ENODEV; return -ENODEV;
if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 && if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &&

6
drivers/macintosh/via-pmu.c
View file

@ -289,7 +289,7 @@ int __init find_via_pmu(void)
if (vias == NULL) if (vias == NULL)
return 0; return 0;
reg = of_get_property(vias, "reg", NULL); reg = get_property(vias, "reg", NULL);
if (reg == NULL) { if (reg == NULL) {
printk(KERN_ERR "via-pmu: No \"reg\" property !\n"); printk(KERN_ERR "via-pmu: No \"reg\" property !\n");
goto fail; goto fail;
@ -334,7 +334,7 @@ int __init find_via_pmu(void)
gpiop = of_find_node_by_name(NULL, "gpio"); gpiop = of_find_node_by_name(NULL, "gpio");
if (gpiop) { if (gpiop) {
reg = of_get_property(gpiop, "reg", NULL); reg = get_property(gpiop, "reg", NULL);
if (reg) if (reg)
gaddr = of_translate_address(gpiop, reg); gaddr = of_translate_address(gpiop, reg);
if (gaddr != OF_BAD_ADDR) if (gaddr != OF_BAD_ADDR)
@ -491,7 +491,7 @@ static int __init via_pmu_dev_init(void)
of_find_node_by_name(NULL, "power-mgt"); of_find_node_by_name(NULL, "power-mgt");
const u32 *prim_info = NULL; const u32 *prim_info = NULL;
if (prim) if (prim)
prim_info = of_get_property(prim, "prim-info", NULL); prim_info = get_property(prim, "prim-info", NULL);
if (prim_info) { if (prim_info) {
/* Other stuffs here yet unknown */ /* Other stuffs here yet unknown */
pmu_battery_count = (prim_info[6] >> 16) & 0xff; pmu_battery_count = (prim_info[6] >> 16) & 0xff;

2
drivers/macintosh/windfarm_lm75_sensor.c
View file

@ -176,7 +176,7 @@ static int wf_lm75_attach(struct i2c_adapter *adapter)
for (dev = NULL; for (dev = NULL;
(dev = of_get_next_child(busnode, dev)) != NULL;) { (dev = of_get_next_child(busnode, dev)) != NULL;) {
const char *loc = const char *loc =
of_get_property(dev, "hwsensor-location", NULL); get_property(dev, "hwsensor-location", NULL);
u8 addr; u8 addr;
/* We must re-match the adapter in order to properly check /* We must re-match the adapter in order to properly check

2
drivers/macintosh/windfarm_max6690_sensor.c
View file

@ -134,7 +134,7 @@ static int wf_max6690_attach(struct i2c_adapter *adapter)
if (!device_is_compatible(dev, "max6690")) if (!device_is_compatible(dev, "max6690"))
continue; continue;
addr = pmac_i2c_get_dev_addr(dev); addr = pmac_i2c_get_dev_addr(dev);
loc = of_get_property(dev, "hwsensor-location", NULL); loc = get_property(dev, "hwsensor-location", NULL);
if (loc == NULL || addr == 0) if (loc == NULL || addr == 0)
continue; continue;
printk("found max6690, loc=%s addr=0x%02x\n", loc, addr); printk("found max6690, loc=%s addr=0x%02x\n", loc, addr);

8
drivers/macintosh/windfarm_smu_controls.c
View file

@ -167,7 +167,7 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
if (fct == NULL) if (fct == NULL)
return NULL; return NULL;
fct->ctrl.ops = &smu_fan_ops; fct->ctrl.ops = &smu_fan_ops;
l = of_get_property(node, "location", NULL); l = get_property(node, "location", NULL);
if (l == NULL) if (l == NULL)
goto fail; goto fail;
@ -224,17 +224,17 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
goto fail; goto fail;
/* Get min & max values*/ /* Get min & max values*/
v = of_get_property(node, "min-value", NULL); v = get_property(node, "min-value", NULL);
if (v == NULL) if (v == NULL)
goto fail; goto fail;
fct->min = *v; fct->min = *v;
v = of_get_property(node, "max-value", NULL); v = get_property(node, "max-value", NULL);
if (v == NULL) if (v == NULL)
goto fail; goto fail;
fct->max = *v; fct->max = *v;
/* Get "reg" value */ /* Get "reg" value */
reg = of_get_property(node, "reg", NULL); reg = get_property(node, "reg", NULL);
if (reg == NULL) if (reg == NULL)
goto fail; goto fail;
fct->reg = *reg; fct->reg = *reg;

8
drivers/macintosh/windfarm_smu_sat.c
View file

@ -241,7 +241,7 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev)
char *name; char *name;
int vsens[2], isens[2]; int vsens[2], isens[2];
reg = of_get_property(dev, "reg", NULL); reg = get_property(dev, "reg", NULL);
if (reg == NULL) if (reg == NULL)
return; return;
addr = *reg; addr = *reg;
@ -268,9 +268,9 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev)
isens[0] = isens[1] = -1; isens[0] = isens[1] = -1;
child = NULL; child = NULL;
while ((child = of_get_next_child(dev, child)) != NULL) { while ((child = of_get_next_child(dev, child)) != NULL) {
reg = of_get_property(child, "reg", NULL); reg = get_property(child, "reg", NULL);
type = of_get_property(child, "device_type", NULL); type = get_property(child, "device_type", NULL);
loc = of_get_property(child, "location", NULL); loc = get_property(child, "location", NULL);
if (reg == NULL || loc == NULL) if (reg == NULL || loc == NULL)
continue; continue;

6
drivers/macintosh/windfarm_smu_sensors.c
View file

@ -204,8 +204,8 @@ static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
ads = kmalloc(sizeof(struct smu_ad_sensor), GFP_KERNEL); ads = kmalloc(sizeof(struct smu_ad_sensor), GFP_KERNEL);
if (ads == NULL) if (ads == NULL)
return NULL; return NULL;
c = of_get_property(node, "device_type", NULL); c = get_property(node, "device_type", NULL);
l = of_get_property(node, "location", NULL); l = get_property(node, "location", NULL);
if (c == NULL || l == NULL) if (c == NULL || l == NULL)
goto fail; goto fail;
@ -255,7 +255,7 @@ static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
} else } else
goto fail; goto fail;
v = of_get_property(node, "reg", NULL); v = get_property(node, "reg", NULL);
if (v == NULL) if (v == NULL)
goto fail; goto fail;
ads->reg = *v; ads->reg = *v;

8
drivers/mtd/maps/physmap_of.c
View file

@ -48,7 +48,7 @@ static int parse_flash_partitions(struct device_node *node,
const u32 *part; const u32 *part;
const char *name; const char *name;
part = of_get_property(node, "partitions", &plen); part = get_property(node, "partitions", &plen);
if (part == NULL) if (part == NULL)
goto err; goto err;
@ -59,7 +59,7 @@ static int parse_flash_partitions(struct device_node *node,
goto err; goto err;
} }
name = of_get_property(node, "partition-names", &plen); name = get_property(node, "partition-names", &plen);
for (i = 0; i < retval; i++) { for (i = 0; i < retval; i++) {
(*parts)[i].offset = *part++; (*parts)[i].offset = *part++;
@ -153,7 +153,7 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev
goto err_out; goto err_out;
} }
width = of_get_property(dp, "bank-width", NULL); width = get_property(dp, "bank-width", NULL);
if (width == NULL) { if (width == NULL) {
dev_err(&dev->dev, "Can't get the flash bank width!\n"); dev_err(&dev->dev, "Can't get the flash bank width!\n");
err = -EINVAL; err = -EINVAL;
@ -174,7 +174,7 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev
simple_map_init(&info->map); simple_map_init(&info->map);
of_probe = of_get_property(dp, "probe-type", NULL); of_probe = get_property(dp, "probe-type", NULL);
if (of_probe == NULL) { if (of_probe == NULL) {
probe_type = rom_probe_types; probe_type = rom_probe_types;
for (; info->mtd == NULL && *probe_type != NULL; probe_type++) for (; info->mtd == NULL && *probe_type != NULL; probe_type++)

5
drivers/net/bmac.c
View file

@ -1261,10 +1261,9 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n"); printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n");
return -ENODEV; return -ENODEV;
} }
prop_addr = of_get_property(macio_get_of_node(mdev), prop_addr = get_property(macio_get_of_node(mdev), "mac-address", NULL);
"mac-address", NULL);
if (prop_addr == NULL) { if (prop_addr == NULL) {
prop_addr = of_get_property(macio_get_of_node(mdev), prop_addr = get_property(macio_get_of_node(mdev),
"local-mac-address", NULL); "local-mac-address", NULL);
if (prop_addr == NULL) { if (prop_addr == NULL) {
printk(KERN_ERR "BMAC: Can't get mac-address\n"); printk(KERN_ERR "BMAC: Can't get mac-address\n");

4
drivers/net/ehea/ehea_main.c
View file

@ -2336,7 +2336,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
port->of_dev_node = dn; port->of_dev_node = dn;
/* Determine logical port id */ /* Determine logical port id */
dn_log_port_id = of_get_property(dn, "ibm,hea-port-no", NULL); dn_log_port_id = get_property(dn, "ibm,hea-port-no", NULL);
if (!dn_log_port_id) { if (!dn_log_port_id) {
ehea_error("bad device node: dn_log_port_id=%p", ehea_error("bad device node: dn_log_port_id=%p",
@ -2502,7 +2502,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
goto out; goto out;
} }
adapter_handle = of_get_property(dev->ofdev.node, "ibm,hea-handle", adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle",
NULL); NULL);
if (adapter_handle) if (adapter_handle)
adapter->handle = *adapter_handle; adapter->handle = *adapter_handle;

4
drivers/net/mace.c
View file

@ -110,9 +110,9 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
return -ENODEV; return -ENODEV;
} }
addr = of_get_property(mace, "mac-address", NULL); addr = get_property(mace, "mac-address", NULL);
if (addr == NULL) { if (addr == NULL) {
addr = of_get_property(mace, "local-mac-address", NULL); addr = get_property(mace, "local-mac-address", NULL);
if (addr == NULL) { if (addr == NULL) {
printk(KERN_ERR "Can't get mac-address for MACE %s\n", printk(KERN_ERR "Can't get mac-address for MACE %s\n",
mace->full_name); mace->full_name);

2
drivers/net/pasemi_mac.c
View file

@ -80,7 +80,7 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
return -ENOENT; return -ENOENT;
} }
maddr = of_get_property(dn, "mac-address", NULL); maddr = get_property(dn, "mac-address", NULL);
if (maddr == NULL) { if (maddr == NULL) {
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"no mac address in device tree, not configuring\n"); "no mac address in device tree, not configuring\n");

4
drivers/net/spider_net.c
View file

@ -1831,7 +1831,7 @@ spider_net_init_firmware(struct spider_net_card *card)
if (!dn) if (!dn)
goto out_err; goto out_err;
fw_prop = of_get_property(dn, "firmware", &fw_size); fw_prop = get_property(dn, "firmware", &fw_size);
if (!fw_prop) if (!fw_prop)
goto out_err; goto out_err;
@ -2237,7 +2237,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
if (!dn) if (!dn)
return -EIO; return -EIO;
mac = of_get_property(dn, "local-mac-address", NULL); mac = get_property(dn, "local-mac-address", NULL);
if (!mac) if (!mac)
return -EIO; return -EIO;
memcpy(addr.sa_data, mac, ETH_ALEN); memcpy(addr.sa_data, mac, ETH_ALEN);

2
drivers/net/sungem.c
View file

@ -2929,7 +2929,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
#elif defined(CONFIG_PPC_PMAC) #elif defined(CONFIG_PPC_PMAC)
const unsigned char *addr; const unsigned char *addr;
addr = of_get_property(gp->of_node, "local-mac-address", NULL); addr = get_property(gp->of_node, "local-mac-address", NULL);
if (addr == NULL) { if (addr == NULL) {
printk("\n"); printk("\n");
printk(KERN_ERR "%s: can't get mac-address\n", dev->name); printk(KERN_ERR "%s: can't get mac-address\n", dev->name);

2
drivers/net/sungem_phy.c
View file

@ -451,7 +451,7 @@ static int bcm5421_init(struct mii_phy* phy)
if (phy->platform_data) { if (phy->platform_data) {
struct device_node *np = of_get_parent(phy->platform_data); struct device_node *np = of_get_parent(phy->platform_data);
int can_low_power = 1; int can_low_power = 1;
if (np == NULL || of_get_property(np, "no-autolowpower", NULL)) if (np == NULL || get_property(np, "no-autolowpower", NULL))
can_low_power = 0; can_low_power = 0;
if (can_low_power) { if (can_low_power) {
/* Enable automatic low-power */ /* Enable automatic low-power */

16
drivers/net/ucc_geth.c
View file

@ -4080,16 +4080,16 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
ugeth_vdbg("%s: IN", __FUNCTION__); ugeth_vdbg("%s: IN", __FUNCTION__);
prop = of_get_property(np, "device-id", NULL); prop = get_property(np, "device-id", NULL);
ucc_num = *prop - 1; ucc_num = *prop - 1;
if ((ucc_num < 0) || (ucc_num > 7)) if ((ucc_num < 0) || (ucc_num > 7))
return -ENODEV; return -ENODEV;
ug_info = &ugeth_info[ucc_num]; ug_info = &ugeth_info[ucc_num];
ug_info->uf_info.ucc_num = ucc_num; ug_info->uf_info.ucc_num = ucc_num;
prop = of_get_property(np, "rx-clock", NULL); prop = get_property(np, "rx-clock", NULL);
ug_info->uf_info.rx_clock = *prop; ug_info->uf_info.rx_clock = *prop;
prop = of_get_property(np, "tx-clock", NULL); prop = get_property(np, "tx-clock", NULL);
ug_info->uf_info.tx_clock = *prop; ug_info->uf_info.tx_clock = *prop;
err = of_address_to_resource(np, 0, &res); err = of_address_to_resource(np, 0, &res);
if (err) if (err)
@ -4098,15 +4098,15 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
ug_info->uf_info.regs = res.start; ug_info->uf_info.regs = res.start;
ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);
ph = of_get_property(np, "phy-handle", NULL); ph = get_property(np, "phy-handle", NULL);
phy = of_find_node_by_phandle(*ph); phy = of_find_node_by_phandle(*ph);
if (phy == NULL) if (phy == NULL)
return -ENODEV; return -ENODEV;
prop = of_get_property(phy, "reg", NULL); prop = get_property(phy, "reg", NULL);
ug_info->phy_address = *prop; ug_info->phy_address = *prop;
prop = of_get_property(phy, "interface", NULL); prop = get_property(phy, "interface", NULL);
ug_info->enet_interface = *prop; ug_info->enet_interface = *prop;
ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0); ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0);
ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)? ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)?
@ -4127,7 +4127,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
/* timing. */ /* timing. */
/* The following compensates by writing to the reserved */ /* The following compensates by writing to the reserved */
/* QE Port Output Hold Registers (CPOH1?). */ /* QE Port Output Hold Registers (CPOH1?). */
prop = of_get_property(phy, "interface", NULL); prop = get_property(phy, "interface", NULL);
phy_interface = *prop; phy_interface = *prop;
if ((phy_interface == ENET_1000_RGMII) || if ((phy_interface == ENET_1000_RGMII) ||
(phy_interface == ENET_100_RGMII) || (phy_interface == ENET_100_RGMII) ||
@ -4140,7 +4140,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
soc = of_find_node_by_type(NULL, "soc"); soc = of_find_node_by_type(NULL, "soc");
if (soc) { if (soc) {
unsigned int size; unsigned int size;
const void *prop = of_get_property(soc, "reg", &size); const void *prop = get_property(soc, "reg", &size);
immrbase = of_translate_address(soc, prop); immrbase = of_translate_address(soc, prop);
of_node_put(soc); of_node_put(soc);
}; };

10
drivers/pci/hotplug/rpaphp_core.c
View file

@ -182,10 +182,10 @@ static int get_children_props(struct device_node *dn, const int **drc_indexes,
{ {
const int *indexes, *names, *types, *domains; const int *indexes, *names, *types, *domains;
indexes = of_get_property(dn, "ibm,drc-indexes", NULL); indexes = get_property(dn, "ibm,drc-indexes", NULL);
names = of_get_property(dn, "ibm,drc-names", NULL); names = get_property(dn, "ibm,drc-names", NULL);
types = of_get_property(dn, "ibm,drc-types", NULL); types = get_property(dn, "ibm,drc-types", NULL);
domains = of_get_property(dn, "ibm,drc-power-domains", NULL); domains = get_property(dn, "ibm,drc-power-domains", NULL);
if (!indexes || !names || !types || !domains) { if (!indexes || !names || !types || !domains) {
/* Slot does not have dynamically-removable children */ /* Slot does not have dynamically-removable children */
@ -218,7 +218,7 @@ int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
char *name_tmp, *type_tmp; char *name_tmp, *type_tmp;
int i, rc; int i, rc;
my_index = of_get_property(dn, "ibm,my-drc-index", NULL); my_index = get_property(dn, "ibm,my-drc-index", NULL);
if (!my_index) { if (!my_index) {
/* Node isn't DLPAR/hotplug capable */ /* Node isn't DLPAR/hotplug capable */
return -EINVAL; return -EINVAL;

8
drivers/scsi/ibmvscsi/ibmvstgt.c
View file

@ -903,16 +903,16 @@ static int get_system_info(void)
if (!rootdn) if (!rootdn)
return -ENOENT; return -ENOENT;
model = of_get_property(rootdn, "model", NULL); model = get_property(rootdn, "model", NULL);
id = of_get_property(rootdn, "system-id", NULL); id = get_property(rootdn, "system-id", NULL);
if (model && id) if (model && id)
snprintf(system_id, sizeof(system_id), "%s-%s", model, id); snprintf(system_id, sizeof(system_id), "%s-%s", model, id);
name = of_get_property(rootdn, "ibm,partition-name", NULL); name = get_property(rootdn, "ibm,partition-name", NULL);
if (name) if (name)
strncpy(partition_name, name, sizeof(partition_name)); strncpy(partition_name, name, sizeof(partition_name));
num = of_get_property(rootdn, "ibm,partition-no", NULL); num = get_property(rootdn, "ibm,partition-no", NULL);
if (num) if (num)
partition_number = *num; partition_number = *num;

4
drivers/scsi/ibmvscsi/rpa_vscsi.c
View file

@ -162,11 +162,11 @@ static void gather_partition_info(void)
return; return;
} }
ppartition_name = of_get_property(rootdn, "ibm,partition-name", NULL); ppartition_name = get_property(rootdn, "ibm,partition-name", NULL);
if (ppartition_name) if (ppartition_name)
strncpy(partition_name, ppartition_name, strncpy(partition_name, ppartition_name,
sizeof(partition_name)); sizeof(partition_name));
p_number_ptr = of_get_property(rootdn, "ibm,partition-no", NULL); p_number_ptr = get_property(rootdn, "ibm,partition-no", NULL);
if (p_number_ptr) if (p_number_ptr)
partition_number = *p_number_ptr; partition_number = *p_number_ptr;
of_node_put(rootdn); of_node_put(rootdn);

2
drivers/scsi/mac53c94.c
View file

@ -471,7 +471,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
goto out_free; goto out_free;
} }
clkprop = of_get_property(node, "clock-frequency", &proplen); clkprop = get_property(node, "clock-frequency", &proplen);
if (clkprop == NULL || proplen != sizeof(int)) { if (clkprop == NULL || proplen != sizeof(int)) {
printk(KERN_ERR "%s: can't get clock frequency, " printk(KERN_ERR "%s: can't get clock frequency, "
"assuming 25MHz\n", node->full_name); "assuming 25MHz\n", node->full_name);

2
drivers/scsi/mesh.c
View file

@ -1947,7 +1947,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
ms->tgts[tgt].current_req = NULL; ms->tgts[tgt].current_req = NULL;
} }
if ((cfp = of_get_property(mesh, "clock-frequency", NULL))) if ((cfp = get_property(mesh, "clock-frequency", NULL)))
ms->clk_freq = *cfp; ms->clk_freq = *cfp;
else { else {
printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n"); printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");

2
drivers/serial/mpc52xx_uart.c
View file

@ -1069,7 +1069,7 @@ mpc52xx_uart_of_enumerate(void)
continue; continue;
/* Is a particular device number requested? */ /* Is a particular device number requested? */
devno = of_get_property(np, "port-number", NULL); devno = get_property(np, "port-number", NULL);
mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1); mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1);
} }

4
drivers/serial/of_serial.c
View file

@ -29,8 +29,8 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
int ret; int ret;
memset(port, 0, sizeof *port); memset(port, 0, sizeof *port);
spd = of_get_property(np, "current-speed", NULL); spd = get_property(np, "current-speed", NULL);
clk = of_get_property(np, "clock-frequency", NULL); clk = get_property(np, "clock-frequency", NULL);
if (!clk) { if (!clk) {
dev_warn(&ofdev->dev, "no clock-frequency property set\n"); dev_warn(&ofdev->dev, "no clock-frequency property set\n");
return -ENODEV; return -ENODEV;

6
drivers/serial/pmac_zilog.c
View file

@ -1452,12 +1452,12 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
*/ */
if (device_is_compatible(np, "cobalt")) if (device_is_compatible(np, "cobalt"))
uap->flags |= PMACZILOG_FLAG_IS_INTMODEM; uap->flags |= PMACZILOG_FLAG_IS_INTMODEM;
conn = of_get_property(np, "AAPL,connector", &len); conn = get_property(np, "AAPL,connector", &len);
if (conn && (strcmp(conn, "infrared") == 0)) if (conn && (strcmp(conn, "infrared") == 0))
uap->flags |= PMACZILOG_FLAG_IS_IRDA; uap->flags |= PMACZILOG_FLAG_IS_IRDA;
uap->port_type = PMAC_SCC_ASYNC; uap->port_type = PMAC_SCC_ASYNC;
/* 1999 Powerbook G3 has slot-names property instead */ /* 1999 Powerbook G3 has slot-names property instead */
slots = of_get_property(np, "slot-names", &len); slots = get_property(np, "slot-names", &len);
if (slots && slots->count > 0) { if (slots && slots->count > 0) {
if (strcmp(slots->name, "IrDA") == 0) if (strcmp(slots->name, "IrDA") == 0)
uap->flags |= PMACZILOG_FLAG_IS_IRDA; uap->flags |= PMACZILOG_FLAG_IS_IRDA;
@ -1471,7 +1471,7 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
of_find_node_by_name(NULL, "i2c-modem"); of_find_node_by_name(NULL, "i2c-modem");
if (i2c_modem) { if (i2c_modem) {
const char* mid = const char* mid =
of_get_property(i2c_modem, "modem-id", NULL); get_property(i2c_modem, "modem-id", NULL);
if (mid) switch(*mid) { if (mid) switch(*mid) {
case 0x04 : case 0x04 :
case 0x05 : case 0x05 :

6
drivers/video/aty/radeon_base.c
View file

@ -422,7 +422,7 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
if (dp == NULL) if (dp == NULL)
return -ENODEV; return -ENODEV;
val = of_get_property(dp, "ATY,RefCLK", NULL); val = get_property(dp, "ATY,RefCLK", NULL);
if (!val || !*val) { if (!val || !*val) {
printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n");
return -EINVAL; return -EINVAL;
@ -430,11 +430,11 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
rinfo->pll.ref_clk = (*val) / 10; rinfo->pll.ref_clk = (*val) / 10;
val = of_get_property(dp, "ATY,SCLK", NULL); val = get_property(dp, "ATY,SCLK", NULL);
if (val && *val) if (val && *val)
rinfo->pll.sclk = (*val) / 10; rinfo->pll.sclk = (*val) / 10;
val = of_get_property(dp, "ATY,MCLK", NULL); val = get_property(dp, "ATY,MCLK", NULL);
if (val && *val) if (val && *val)
rinfo->pll.mclk = (*val) / 10; rinfo->pll.mclk = (*val) / 10;

13
drivers/video/aty/radeon_monitor.c
View file

@ -65,12 +65,12 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID", static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID",
"EDID1", "EDID2", NULL }; "EDID1", "EDID2", NULL };
const u8 *pedid = NULL; const u8 *pedid = NULL;
const u8 *pmt; const u8 *pmt = NULL;
u8 *tmp; u8 *tmp;
int i, mt = MT_NONE; int i, mt = MT_NONE;
RTRACE("analyzing OF properties...\n"); RTRACE("analyzing OF properties...\n");
pmt = of_get_property(dp, "display-type", NULL); pmt = get_property(dp, "display-type", NULL);
if (!pmt) if (!pmt)
return MT_NONE; return MT_NONE;
RTRACE("display-type: %s\n", pmt); RTRACE("display-type: %s\n", pmt);
@ -89,7 +89,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
} }
for (i = 0; propnames[i] != NULL; ++i) { for (i = 0; propnames[i] != NULL; ++i) {
pedid = of_get_property(dp, propnames[i], NULL); pedid = get_property(dp, propnames[i], NULL);
if (pedid != NULL) if (pedid != NULL)
break; break;
} }
@ -98,10 +98,9 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
* single-head cards have hdno == -1 and skip this step * single-head cards have hdno == -1 and skip this step
*/ */
if (pedid == NULL && dp->parent && (hdno != -1)) if (pedid == NULL && dp->parent && (hdno != -1))
pedid = of_get_property(dp->parent, pedid = get_property(dp->parent, (hdno == 0) ? "EDID1" : "EDID2", NULL);
(hdno == 0) ? "EDID1" : "EDID2", NULL);
if (pedid == NULL && dp->parent && (hdno == 0)) if (pedid == NULL && dp->parent && (hdno == 0))
pedid = of_get_property(dp->parent, "EDID", NULL); pedid = get_property(dp->parent, "EDID", NULL);
if (pedid == NULL) if (pedid == NULL)
return mt; return mt;
@ -131,7 +130,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
do { do {
if (!dp) if (!dp)
return MT_NONE; return MT_NONE;
pname = of_get_property(dp, "name", NULL); pname = get_property(dp, "name", NULL);
if (!pname) if (!pname)
return MT_NONE; return MT_NONE;
len = strlen(pname); len = strlen(pname);

2
drivers/video/aty/radeon_pm.c
View file

@ -1290,7 +1290,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
if (rinfo->of_node != NULL) { if (rinfo->of_node != NULL) {
int size; int size;
mrtable = of_get_property(rinfo->of_node, "ATY,MRT", &size); mrtable = get_property(rinfo->of_node, "ATY,MRT", &size);
if (mrtable) if (mrtable)
mrtable_size = size >> 2; mrtable_size = size >> 2;
else else

8
drivers/video/nvidia/nv_of.c
View file

@ -46,15 +46,15 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
for (dp = NULL; for (dp = NULL;
(dp = of_get_next_child(parent, dp)) != NULL;) { (dp = of_get_next_child(parent, dp)) != NULL;) {
pname = of_get_property(dp, "name", NULL); pname = get_property(dp, "name", NULL);
if (!pname) if (!pname)
continue; continue;
len = strlen(pname); len = strlen(pname);
if ((pname[len-1] == 'A' && conn == 1) || if ((pname[len-1] == 'A' && conn == 1) ||
(pname[len-1] == 'B' && conn == 2)) { (pname[len-1] == 'B' && conn == 2)) {
for (i = 0; propnames[i] != NULL; ++i) { for (i = 0; propnames[i] != NULL; ++i) {
pedid = of_get_property(dp, pedid = get_property(dp, propnames[i],
propnames[i], NULL); NULL);
if (pedid != NULL) if (pedid != NULL)
break; break;
} }
@ -65,7 +65,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
} }
if (pedid == NULL) { if (pedid == NULL) {
for (i = 0; propnames[i] != NULL; ++i) { for (i = 0; propnames[i] != NULL; ++i) {
pedid = of_get_property(parent, propnames[i], NULL); pedid = get_property(parent, propnames[i], NULL);
if (pedid != NULL) if (pedid != NULL)
break; break;
} }

28
drivers/video/offb.c
View file

@ -425,27 +425,27 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
const u32 *pp, *addrp, *up; const u32 *pp, *addrp, *up;
u64 asize; u64 asize;
pp = of_get_property(dp, "linux,bootx-depth", &len); pp = get_property(dp, "linux,bootx-depth", &len);
if (pp == NULL) if (pp == NULL)
pp = of_get_property(dp, "depth", &len); pp = get_property(dp, "depth", &len);
if (pp && len == sizeof(u32)) if (pp && len == sizeof(u32))
depth = *pp; depth = *pp;
pp = of_get_property(dp, "linux,bootx-width", &len); pp = get_property(dp, "linux,bootx-width", &len);
if (pp == NULL) if (pp == NULL)
pp = of_get_property(dp, "width", &len); pp = get_property(dp, "width", &len);
if (pp && len == sizeof(u32)) if (pp && len == sizeof(u32))
width = *pp; width = *pp;
pp = of_get_property(dp, "linux,bootx-height", &len); pp = get_property(dp, "linux,bootx-height", &len);
if (pp == NULL) if (pp == NULL)
pp = of_get_property(dp, "height", &len); pp = get_property(dp, "height", &len);
if (pp && len == sizeof(u32)) if (pp && len == sizeof(u32))
height = *pp; height = *pp;
pp = of_get_property(dp, "linux,bootx-linebytes", &len); pp = get_property(dp, "linux,bootx-linebytes", &len);
if (pp == NULL) if (pp == NULL)
pp = of_get_property(dp, "linebytes", &len); pp = get_property(dp, "linebytes", &len);
if (pp && len == sizeof(u32) && (*pp != 0xffffffffu)) if (pp && len == sizeof(u32) && (*pp != 0xffffffffu))
pitch = *pp; pitch = *pp;
else else
@ -463,9 +463,9 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
* ranges and pick one that is both big enough and if possible encloses * ranges and pick one that is both big enough and if possible encloses
* the "address" property. If none match, we pick the biggest * the "address" property. If none match, we pick the biggest
*/ */
up = of_get_property(dp, "linux,bootx-addr", &len); up = get_property(dp, "linux,bootx-addr", &len);
if (up == NULL) if (up == NULL)
up = of_get_property(dp, "address", &len); up = get_property(dp, "address", &len);
if (up && len == sizeof(u32)) if (up && len == sizeof(u32))
addr_prop = *up; addr_prop = *up;
@ -521,7 +521,7 @@ static int __init offb_init(void)
return -ENODEV; return -ENODEV;
/* Check if we have a MacOS display without a node spec */ /* Check if we have a MacOS display without a node spec */
if (of_get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) { if (get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) {
/* The old code tried to work out which node was the MacOS /* The old code tried to work out which node was the MacOS
* display based on the address. I'm dropping that since the * display based on the address. I'm dropping that since the
* lack of a node spec only happens with old BootX versions * lack of a node spec only happens with old BootX versions
@ -532,14 +532,14 @@ static int __init offb_init(void)
} }
for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) { for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
if (of_get_property(dp, "linux,opened", NULL) && if (get_property(dp, "linux,opened", NULL) &&
of_get_property(dp, "linux,boot-display", NULL)) { get_property(dp, "linux,boot-display", NULL)) {
boot_disp = dp; boot_disp = dp;
offb_init_nodriver(dp, 0); offb_init_nodriver(dp, 0);
} }
} }
for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) { for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
if (of_get_property(dp, "linux,opened", NULL) && if (get_property(dp, "linux,opened", NULL) &&
dp != boot_disp) dp != boot_disp)
offb_init_nodriver(dp, 0); offb_init_nodriver(dp, 0);
} }

4
drivers/video/riva/fbdev.c
View file

@ -1760,13 +1760,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
NVTRACE_ENTER(); NVTRACE_ENTER();
dp = pci_device_to_OF_node(pd); dp = pci_device_to_OF_node(pd);
for (; dp != NULL; dp = dp->child) { for (; dp != NULL; dp = dp->child) {
disptype = of_get_property(dp, "display-type", NULL); disptype = get_property(dp, "display-type", NULL);
if (disptype == NULL) if (disptype == NULL)
continue; continue;
if (strncmp(disptype, "LCD", 3) != 0) if (strncmp(disptype, "LCD", 3) != 0)
continue; continue;
for (i = 0; propnames[i] != NULL; ++i) { for (i = 0; propnames[i] != NULL; ++i) {
pedid = of_get_property(dp, propnames[i], NULL); pedid = get_property(dp, propnames[i], NULL);
if (pedid != NULL) { if (pedid != NULL) {
par->EDID = (unsigned char *)pedid; par->EDID = (unsigned char *)pedid;
NVTRACE("LCD found.\n"); NVTRACE("LCD found.\n");