Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[POWERPC] Rename get_property to of_get_property: drivers

These are all the remaining instances of get_property. Simple rename of
get_property to of_get_property.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

Stephen Rothwell and committed by
Paul Mackerras
40cd3a45 9f9a3b8a

+87 -85
+1 -1
drivers/ata/sata_svw.c
··· 288 288 /* Match it to a port node */ 289 289 index = (ap == ap->host->ports[0]) ? 0 : 1; 290 290 for (np = np->child; np != NULL; np = np->sibling) { 291 - const u32 *reg = get_property(np, "reg", NULL); 291 + const u32 *reg = of_get_property(np, "reg", NULL); 292 292 if (!reg) 293 293 continue; 294 294 if (index == *reg)
+1 -1
drivers/char/agp/uninorth-agp.c
··· 613 613 uninorth_node = of_find_node_by_name(NULL, "u3"); 614 614 } 615 615 if (uninorth_node) { 616 - const int *revprop = get_property(uninorth_node, 616 + const int *revprop = of_get_property(uninorth_node, 617 617 "device-rev", NULL); 618 618 if (revprop != NULL) 619 619 uninorth_rev = *revprop & 0x3f;
+1 -1
drivers/char/briq_panel.c
··· 206 206 const char *machine; 207 207 int i; 208 208 209 - machine = get_property(root, "model", NULL); 209 + machine = of_get_property(root, "model", NULL); 210 210 if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) { 211 211 of_node_put(root); 212 212 return -ENODEV;
+1 -1
drivers/char/tpm/tpm_atmel.h
··· 52 52 return NULL; 53 53 } 54 54 55 - reg = get_property(dn, "reg", &reglen); 55 + reg = of_get_property(dn, "reg", &reglen); 56 56 naddrc = of_n_addr_cells(dn); 57 57 nsizec = of_n_size_cells(dn); 58 58
+1 -1
drivers/hwmon/ams/ams-core.c
··· 144 144 const u32 *prop; 145 145 146 146 /* Get orientation */ 147 - prop = get_property(ams_info.of_node, "orientation", NULL); 147 + prop = of_get_property(ams_info.of_node, "orientation", NULL); 148 148 if (!prop) 149 149 return -ENODEV; 150 150 ams_info.orient1 = *prop;
+1 -1
drivers/hwmon/ams/ams-i2c.c
··· 276 276 ams_info.bustype = BUS_I2C; 277 277 278 278 /* look for bus either using "reg" or by path */ 279 - prop = get_property(ams_info.of_node, "reg", NULL); 279 + prop = of_get_property(ams_info.of_node, "reg", NULL); 280 280 if (!prop) { 281 281 result = -ENODEV; 282 282
+1 -1
drivers/hwmon/ams/ams-pmu.c
··· 160 160 ams_info.bustype = BUS_HOST; 161 161 162 162 /* Get PMU command, should be 0x4e, but we can never know */ 163 - prop = get_property(ams_info.of_node, "reg", NULL); 163 + prop = of_get_property(ams_info.of_node, "reg", NULL); 164 164 if (!prop) { 165 165 result = -ENODEV; 166 166 goto exit;
+2 -2
drivers/ide/ppc/pmac.c
··· 1175 1175 pmif->broken_dma = 1; 1176 1176 } 1177 1177 1178 - bidp = get_property(np, "AAPL,bus-id", NULL); 1178 + bidp = of_get_property(np, "AAPL,bus-id", NULL); 1179 1179 pmif->aapl_bus_id = bidp ? *bidp : 0; 1180 1180 1181 1181 /* Get cable type from device-tree */ 1182 1182 if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6 1183 1183 || pmif->kind == controller_k2_ata6 1184 1184 || pmif->kind == controller_sh_ata6) { 1185 - const char* cable = get_property(np, "cable-type", NULL); 1185 + const char* cable = of_get_property(np, "cable-type", NULL); 1186 1186 if (cable && !strncmp(cable, "80-", 3)) 1187 1187 pmif->cable_80 = 1; 1188 1188 }
+1 -1
drivers/infiniband/hw/ehca/ehca_main.c
··· 569 569 struct ib_pd *ibpd; 570 570 int ret; 571 571 572 - handle = get_property(dev->ofdev.node, "ibm,hca-handle", NULL); 572 + handle = of_get_property(dev->ofdev.node, "ibm,hca-handle", NULL); 573 573 if (!handle) { 574 574 ehca_gen_err("Cannot get eHCA handle for adapter: %s.", 575 575 dev->ofdev.node->full_name);
+4 -4
drivers/mtd/maps/physmap_of.c
··· 48 48 const u32 *part; 49 49 const char *name; 50 50 51 - part = get_property(node, "partitions", &plen); 51 + part = of_get_property(node, "partitions", &plen); 52 52 if (part == NULL) 53 53 goto err; 54 54 ··· 59 59 goto err; 60 60 } 61 61 62 - name = get_property(node, "partition-names", &plen); 62 + name = of_get_property(node, "partition-names", &plen); 63 63 64 64 for (i = 0; i < retval; i++) { 65 65 (*parts)[i].offset = *part++; ··· 153 153 goto err_out; 154 154 } 155 155 156 - width = get_property(dp, "bank-width", NULL); 156 + width = of_get_property(dp, "bank-width", NULL); 157 157 if (width == NULL) { 158 158 dev_err(&dev->dev, "Can't get the flash bank width!\n"); 159 159 err = -EINVAL; ··· 174 174 175 175 simple_map_init(&info->map); 176 176 177 - of_probe = get_property(dp, "probe-type", NULL); 177 + of_probe = of_get_property(dp, "probe-type", NULL); 178 178 if (of_probe == NULL) { 179 179 probe_type = rom_probe_types; 180 180 for (; info->mtd == NULL && *probe_type != NULL; probe_type++)
+3 -2
drivers/net/bmac.c
··· 1260 1260 printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n"); 1261 1261 return -ENODEV; 1262 1262 } 1263 - prop_addr = get_property(macio_get_of_node(mdev), "mac-address", NULL); 1263 + prop_addr = of_get_property(macio_get_of_node(mdev), 1264 + "mac-address", NULL); 1264 1265 if (prop_addr == NULL) { 1265 - prop_addr = get_property(macio_get_of_node(mdev), 1266 + prop_addr = of_get_property(macio_get_of_node(mdev), 1266 1267 "local-mac-address", NULL); 1267 1268 if (prop_addr == NULL) { 1268 1269 printk(KERN_ERR "BMAC: Can't get mac-address\n");
+3 -3
drivers/net/ehea/ehea_main.c
··· 2609 2609 lhea_dn = adapter->ebus_dev->ofdev.node; 2610 2610 while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) { 2611 2611 2612 - dn_log_port_id = get_property(eth_dn, "ibm,hea-port-no", 2612 + dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no", 2613 2613 NULL); 2614 2614 if (!dn_log_port_id) { 2615 2615 ehea_error("bad device node: eth_dn name=%s", ··· 2649 2649 lhea_dn = adapter->ebus_dev->ofdev.node; 2650 2650 while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) { 2651 2651 2652 - dn_log_port_id = get_property(eth_dn, "ibm,hea-port-no", 2652 + dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no", 2653 2653 NULL); 2654 2654 if (dn_log_port_id) 2655 2655 if (*dn_log_port_id == logical_port_id) ··· 2790 2790 2791 2791 adapter->ebus_dev = dev; 2792 2792 2793 - adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle", 2793 + adapter_handle = of_get_property(dev->ofdev.node, "ibm,hea-handle", 2794 2794 NULL); 2795 2795 if (adapter_handle) 2796 2796 adapter->handle = *adapter_handle;
+2 -2
drivers/net/mace.c
··· 110 110 return -ENODEV; 111 111 } 112 112 113 - addr = get_property(mace, "mac-address", NULL); 113 + addr = of_get_property(mace, "mac-address", NULL); 114 114 if (addr == NULL) { 115 - addr = get_property(mace, "local-mac-address", NULL); 115 + addr = of_get_property(mace, "local-mac-address", NULL); 116 116 if (addr == NULL) { 117 117 printk(KERN_ERR "Can't get mac-address for MACE %s\n", 118 118 mace->full_name);
+1 -1
drivers/net/pasemi_mac.c
··· 80 80 return -ENOENT; 81 81 } 82 82 83 - maddr = get_property(dn, "mac-address", NULL); 83 + maddr = of_get_property(dn, "mac-address", NULL); 84 84 if (maddr == NULL) { 85 85 dev_warn(&pdev->dev, 86 86 "no mac address in device tree, not configuring\n");
+2 -2
drivers/net/spider_net.c
··· 1830 1830 if (!dn) 1831 1831 goto out_err; 1832 1832 1833 - fw_prop = get_property(dn, "firmware", &fw_size); 1833 + fw_prop = of_get_property(dn, "firmware", &fw_size); 1834 1834 if (!fw_prop) 1835 1835 goto out_err; 1836 1836 ··· 2236 2236 if (!dn) 2237 2237 return -EIO; 2238 2238 2239 - mac = get_property(dn, "local-mac-address", NULL); 2239 + mac = of_get_property(dn, "local-mac-address", NULL); 2240 2240 if (!mac) 2241 2241 return -EIO; 2242 2242 memcpy(addr.sa_data, mac, ETH_ALEN);
+1 -1
drivers/net/sungem.c
··· 2903 2903 struct net_device *dev = gp->dev; 2904 2904 const unsigned char *addr; 2905 2905 2906 - addr = get_property(gp->of_node, "local-mac-address", NULL); 2906 + addr = of_get_property(gp->of_node, "local-mac-address", NULL); 2907 2907 if (addr == NULL) { 2908 2908 #ifdef CONFIG_SPARC 2909 2909 addr = idprom->id_ethaddr;
+1 -1
drivers/net/sungem_phy.c
··· 451 451 if (phy->platform_data) { 452 452 struct device_node *np = of_get_parent(phy->platform_data); 453 453 int can_low_power = 1; 454 - if (np == NULL || get_property(np, "no-autolowpower", NULL)) 454 + if (np == NULL || of_get_property(np, "no-autolowpower", NULL)) 455 455 can_low_power = 0; 456 456 if (can_low_power) { 457 457 /* Enable automatic low-power */
+9 -9
drivers/net/ucc_geth.c
··· 3787 3787 3788 3788 ugeth_vdbg("%s: IN", __FUNCTION__); 3789 3789 3790 - prop = get_property(np, "device-id", NULL); 3790 + prop = of_get_property(np, "device-id", NULL); 3791 3791 ucc_num = *prop - 1; 3792 3792 if ((ucc_num < 0) || (ucc_num > 7)) 3793 3793 return -ENODEV; ··· 3795 3795 ug_info = &ugeth_info[ucc_num]; 3796 3796 ug_info->uf_info.ucc_num = ucc_num; 3797 3797 3798 - prop = get_property(np, "rx-clock", NULL); 3798 + prop = of_get_property(np, "rx-clock", NULL); 3799 3799 ug_info->uf_info.rx_clock = *prop; 3800 - prop = get_property(np, "tx-clock", NULL); 3800 + prop = of_get_property(np, "tx-clock", NULL); 3801 3801 ug_info->uf_info.tx_clock = *prop; 3802 3802 err = of_address_to_resource(np, 0, &res); 3803 3803 if (err) ··· 3806 3806 ug_info->uf_info.regs = res.start; 3807 3807 ug_info->uf_info.irq = irq_of_parse_and_map(np, 0); 3808 3808 3809 - ph = get_property(np, "phy-handle", NULL); 3809 + ph = of_get_property(np, "phy-handle", NULL); 3810 3810 phy = of_find_node_by_phandle(*ph); 3811 3811 3812 3812 if (phy == NULL) 3813 3813 return -ENODEV; 3814 3814 3815 3815 /* set the PHY address */ 3816 - prop = get_property(phy, "reg", NULL); 3816 + prop = of_get_property(phy, "reg", NULL); 3817 3817 if (prop == NULL) 3818 3818 return -1; 3819 3819 ug_info->phy_address = *prop; 3820 3820 3821 3821 /* get the phy interface type, or default to MII */ 3822 - prop = get_property(np, "interface-type", NULL); 3822 + prop = of_get_property(np, "interface-type", NULL); 3823 3823 if (!prop) { 3824 3824 /* handle interface property present in old trees */ 3825 - prop = get_property(phy, "interface", NULL); 3825 + prop = of_get_property(phy, "interface", NULL); 3826 3826 if (prop != NULL) 3827 3827 phy_interface = enet_to_phy_interface[*prop]; 3828 3828 else ··· 3832 3832 } 3833 3833 3834 3834 /* get speed, or derive from interface */ 3835 - prop = get_property(np, "max-speed", NULL); 3835 + prop = of_get_property(np, "max-speed", NULL); 3836 3836 if (!prop) { 3837 3837 /* handle interface property present in old trees */ 3838 - prop = get_property(phy, "interface", NULL); 3838 + prop = of_get_property(phy, "interface", NULL); 3839 3839 if (prop != NULL) 3840 3840 max_speed = enet_to_speed[*prop]; 3841 3841 } else {
+2 -2
drivers/net/ucc_geth_mii.c
··· 172 172 while ((child = of_get_next_child(np, child)) != NULL) { 173 173 int irq = irq_of_parse_and_map(child, 0); 174 174 if (irq != NO_IRQ) { 175 - const u32 *id = get_property(child, "reg", NULL); 175 + const u32 *id = of_get_property(child, "reg", NULL); 176 176 new_bus->irq[*id] = irq; 177 177 } 178 178 } ··· 203 203 if ((res.start >= tempres.start) && 204 204 (res.end <= tempres.end)) { 205 205 /* set this UCC to be the MII master */ 206 - const u32 *id = get_property(tempnp, "device-id", NULL); 206 + const u32 *id = of_get_property(tempnp, "device-id", NULL); 207 207 if (id == NULL) 208 208 goto bus_register_fail; 209 209
+5 -5
drivers/pci/hotplug/rpaphp_core.c
··· 182 182 { 183 183 const int *indexes, *names, *types, *domains; 184 184 185 - indexes = get_property(dn, "ibm,drc-indexes", NULL); 186 - names = get_property(dn, "ibm,drc-names", NULL); 187 - types = get_property(dn, "ibm,drc-types", NULL); 188 - domains = get_property(dn, "ibm,drc-power-domains", NULL); 185 + indexes = of_get_property(dn, "ibm,drc-indexes", NULL); 186 + names = of_get_property(dn, "ibm,drc-names", NULL); 187 + types = of_get_property(dn, "ibm,drc-types", NULL); 188 + domains = of_get_property(dn, "ibm,drc-power-domains", NULL); 189 189 190 190 if (!indexes || !names || !types || !domains) { 191 191 /* Slot does not have dynamically-removable children */ ··· 218 218 char *name_tmp, *type_tmp; 219 219 int i, rc; 220 220 221 - my_index = get_property(dn, "ibm,my-drc-index", NULL); 221 + my_index = of_get_property(dn, "ibm,my-drc-index", NULL); 222 222 if (!my_index) { 223 223 /* Node isn't DLPAR/hotplug capable */ 224 224 return -EINVAL;
+4 -4
drivers/scsi/ibmvscsi/ibmvstgt.c
··· 903 903 if (!rootdn) 904 904 return -ENOENT; 905 905 906 - model = get_property(rootdn, "model", NULL); 907 - id = get_property(rootdn, "system-id", NULL); 906 + model = of_get_property(rootdn, "model", NULL); 907 + id = of_get_property(rootdn, "system-id", NULL); 908 908 if (model && id) 909 909 snprintf(system_id, sizeof(system_id), "%s-%s", model, id); 910 910 911 - name = get_property(rootdn, "ibm,partition-name", NULL); 911 + name = of_get_property(rootdn, "ibm,partition-name", NULL); 912 912 if (name) 913 913 strncpy(partition_name, name, sizeof(partition_name)); 914 914 915 - num = get_property(rootdn, "ibm,partition-no", NULL); 915 + num = of_get_property(rootdn, "ibm,partition-no", NULL); 916 916 if (num) 917 917 partition_number = *num; 918 918
+2 -2
drivers/scsi/ibmvscsi/rpa_vscsi.c
··· 162 162 return; 163 163 } 164 164 165 - ppartition_name = get_property(rootdn, "ibm,partition-name", NULL); 165 + ppartition_name = of_get_property(rootdn, "ibm,partition-name", NULL); 166 166 if (ppartition_name) 167 167 strncpy(partition_name, ppartition_name, 168 168 sizeof(partition_name)); 169 - p_number_ptr = get_property(rootdn, "ibm,partition-no", NULL); 169 + p_number_ptr = of_get_property(rootdn, "ibm,partition-no", NULL); 170 170 if (p_number_ptr) 171 171 partition_number = *p_number_ptr; 172 172 of_node_put(rootdn);
+1 -1
drivers/scsi/mac53c94.c
··· 471 471 goto out_free; 472 472 } 473 473 474 - clkprop = get_property(node, "clock-frequency", &proplen); 474 + clkprop = of_get_property(node, "clock-frequency", &proplen); 475 475 if (clkprop == NULL || proplen != sizeof(int)) { 476 476 printk(KERN_ERR "%s: can't get clock frequency, " 477 477 "assuming 25MHz\n", node->full_name);
+1 -1
drivers/scsi/mesh.c
··· 1947 1947 ms->tgts[tgt].current_req = NULL; 1948 1948 } 1949 1949 1950 - if ((cfp = get_property(mesh, "clock-frequency", NULL))) 1950 + if ((cfp = of_get_property(mesh, "clock-frequency", NULL))) 1951 1951 ms->clk_freq = *cfp; 1952 1952 else { 1953 1953 printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");
+1 -1
drivers/serial/mpc52xx_uart.c
··· 1069 1069 continue; 1070 1070 1071 1071 /* Is a particular device number requested? */ 1072 - devno = get_property(np, "port-number", NULL); 1072 + devno = of_get_property(np, "port-number", NULL); 1073 1073 mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1); 1074 1074 } 1075 1075
+2 -2
drivers/serial/of_serial.c
··· 29 29 int ret; 30 30 31 31 memset(port, 0, sizeof *port); 32 - spd = get_property(np, "current-speed", NULL); 33 - clk = get_property(np, "clock-frequency", NULL); 32 + spd = of_get_property(np, "current-speed", NULL); 33 + clk = of_get_property(np, "clock-frequency", NULL); 34 34 if (!clk) { 35 35 dev_warn(&ofdev->dev, "no clock-frequency property set\n"); 36 36 return -ENODEV;
+3 -3
drivers/serial/pmac_zilog.c
··· 1452 1452 */ 1453 1453 if (device_is_compatible(np, "cobalt")) 1454 1454 uap->flags |= PMACZILOG_FLAG_IS_INTMODEM; 1455 - conn = get_property(np, "AAPL,connector", &len); 1455 + conn = of_get_property(np, "AAPL,connector", &len); 1456 1456 if (conn && (strcmp(conn, "infrared") == 0)) 1457 1457 uap->flags |= PMACZILOG_FLAG_IS_IRDA; 1458 1458 uap->port_type = PMAC_SCC_ASYNC; 1459 1459 /* 1999 Powerbook G3 has slot-names property instead */ 1460 - slots = get_property(np, "slot-names", &len); 1460 + slots = of_get_property(np, "slot-names", &len); 1461 1461 if (slots && slots->count > 0) { 1462 1462 if (strcmp(slots->name, "IrDA") == 0) 1463 1463 uap->flags |= PMACZILOG_FLAG_IS_IRDA; ··· 1471 1471 of_find_node_by_name(NULL, "i2c-modem"); 1472 1472 if (i2c_modem) { 1473 1473 const char* mid = 1474 - get_property(i2c_modem, "modem-id", NULL); 1474 + of_get_property(i2c_modem, "modem-id", NULL); 1475 1475 if (mid) switch(*mid) { 1476 1476 case 0x04 : 1477 1477 case 0x05 :
+3 -3
drivers/video/aty/radeon_base.c
··· 422 422 423 423 if (dp == NULL) 424 424 return -ENODEV; 425 - val = get_property(dp, "ATY,RefCLK", NULL); 425 + val = of_get_property(dp, "ATY,RefCLK", NULL); 426 426 if (!val || !*val) { 427 427 printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); 428 428 return -EINVAL; ··· 430 430 431 431 rinfo->pll.ref_clk = (*val) / 10; 432 432 433 - val = get_property(dp, "ATY,SCLK", NULL); 433 + val = of_get_property(dp, "ATY,SCLK", NULL); 434 434 if (val && *val) 435 435 rinfo->pll.sclk = (*val) / 10; 436 436 437 - val = get_property(dp, "ATY,MCLK", NULL); 437 + val = of_get_property(dp, "ATY,MCLK", NULL); 438 438 if (val && *val) 439 439 rinfo->pll.mclk = (*val) / 10; 440 440
+6 -5
drivers/video/aty/radeon_monitor.c
··· 70 70 int i, mt = MT_NONE; 71 71 72 72 RTRACE("analyzing OF properties...\n"); 73 - pmt = get_property(dp, "display-type", NULL); 73 + pmt = of_get_property(dp, "display-type", NULL); 74 74 if (!pmt) 75 75 return MT_NONE; 76 76 RTRACE("display-type: %s\n", pmt); ··· 89 89 } 90 90 91 91 for (i = 0; propnames[i] != NULL; ++i) { 92 - pedid = get_property(dp, propnames[i], NULL); 92 + pedid = of_get_property(dp, propnames[i], NULL); 93 93 if (pedid != NULL) 94 94 break; 95 95 } ··· 98 98 * single-head cards have hdno == -1 and skip this step 99 99 */ 100 100 if (pedid == NULL && dp->parent && (hdno != -1)) 101 - pedid = get_property(dp->parent, (hdno == 0) ? "EDID1" : "EDID2", NULL); 101 + pedid = of_get_property(dp->parent, 102 + (hdno == 0) ? "EDID1" : "EDID2", NULL); 102 103 if (pedid == NULL && dp->parent && (hdno == 0)) 103 - pedid = get_property(dp->parent, "EDID", NULL); 104 + pedid = of_get_property(dp->parent, "EDID", NULL); 104 105 if (pedid == NULL) 105 106 return mt; 106 107 ··· 131 130 do { 132 131 if (!dp) 133 132 return MT_NONE; 134 - pname = get_property(dp, "name", NULL); 133 + pname = of_get_property(dp, "name", NULL); 135 134 if (!pname) 136 135 return MT_NONE; 137 136 len = strlen(pname);
+1 -1
drivers/video/aty/radeon_pm.c
··· 1290 1290 if (rinfo->of_node != NULL) { 1291 1291 int size; 1292 1292 1293 - mrtable = get_property(rinfo->of_node, "ATY,MRT", &size); 1293 + mrtable = of_get_property(rinfo->of_node, "ATY,MRT", &size); 1294 1294 if (mrtable) 1295 1295 mrtable_size = size >> 2; 1296 1296 else
+4 -4
drivers/video/nvidia/nv_of.c
··· 46 46 47 47 for (dp = NULL; 48 48 (dp = of_get_next_child(parent, dp)) != NULL;) { 49 - pname = get_property(dp, "name", NULL); 49 + pname = of_get_property(dp, "name", NULL); 50 50 if (!pname) 51 51 continue; 52 52 len = strlen(pname); 53 53 if ((pname[len-1] == 'A' && conn == 1) || 54 54 (pname[len-1] == 'B' && conn == 2)) { 55 55 for (i = 0; propnames[i] != NULL; ++i) { 56 - pedid = get_property(dp, propnames[i], 57 - NULL); 56 + pedid = of_get_property(dp, 57 + propnames[i], NULL); 58 58 if (pedid != NULL) 59 59 break; 60 60 } ··· 65 65 } 66 66 if (pedid == NULL) { 67 67 for (i = 0; propnames[i] != NULL; ++i) { 68 - pedid = get_property(parent, propnames[i], NULL); 68 + pedid = of_get_property(parent, propnames[i], NULL); 69 69 if (pedid != NULL) 70 70 break; 71 71 }
+14 -14
drivers/video/offb.c
··· 425 425 const u32 *pp, *addrp, *up; 426 426 u64 asize; 427 427 428 - pp = get_property(dp, "linux,bootx-depth", &len); 428 + pp = of_get_property(dp, "linux,bootx-depth", &len); 429 429 if (pp == NULL) 430 - pp = get_property(dp, "depth", &len); 430 + pp = of_get_property(dp, "depth", &len); 431 431 if (pp && len == sizeof(u32)) 432 432 depth = *pp; 433 433 434 - pp = get_property(dp, "linux,bootx-width", &len); 434 + pp = of_get_property(dp, "linux,bootx-width", &len); 435 435 if (pp == NULL) 436 - pp = get_property(dp, "width", &len); 436 + pp = of_get_property(dp, "width", &len); 437 437 if (pp && len == sizeof(u32)) 438 438 width = *pp; 439 439 440 - pp = get_property(dp, "linux,bootx-height", &len); 440 + pp = of_get_property(dp, "linux,bootx-height", &len); 441 441 if (pp == NULL) 442 - pp = get_property(dp, "height", &len); 442 + pp = of_get_property(dp, "height", &len); 443 443 if (pp && len == sizeof(u32)) 444 444 height = *pp; 445 445 446 - pp = get_property(dp, "linux,bootx-linebytes", &len); 446 + pp = of_get_property(dp, "linux,bootx-linebytes", &len); 447 447 if (pp == NULL) 448 - pp = get_property(dp, "linebytes", &len); 448 + pp = of_get_property(dp, "linebytes", &len); 449 449 if (pp && len == sizeof(u32) && (*pp != 0xffffffffu)) 450 450 pitch = *pp; 451 451 else ··· 463 463 * ranges and pick one that is both big enough and if possible encloses 464 464 * the "address" property. If none match, we pick the biggest 465 465 */ 466 - up = get_property(dp, "linux,bootx-addr", &len); 466 + up = of_get_property(dp, "linux,bootx-addr", &len); 467 467 if (up == NULL) 468 - up = get_property(dp, "address", &len); 468 + up = of_get_property(dp, "address", &len); 469 469 if (up && len == sizeof(u32)) 470 470 addr_prop = *up; 471 471 ··· 521 521 return -ENODEV; 522 522 523 523 /* Check if we have a MacOS display without a node spec */ 524 - if (get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) { 524 + if (of_get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) { 525 525 /* The old code tried to work out which node was the MacOS 526 526 * display based on the address. I'm dropping that since the 527 527 * lack of a node spec only happens with old BootX versions ··· 532 532 } 533 533 534 534 for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) { 535 - if (get_property(dp, "linux,opened", NULL) && 536 - get_property(dp, "linux,boot-display", NULL)) { 535 + if (of_get_property(dp, "linux,opened", NULL) && 536 + of_get_property(dp, "linux,boot-display", NULL)) { 537 537 boot_disp = dp; 538 538 offb_init_nodriver(dp, 0); 539 539 } 540 540 } 541 541 for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) { 542 - if (get_property(dp, "linux,opened", NULL) && 542 + if (of_get_property(dp, "linux,opened", NULL) && 543 543 dp != boot_disp) 544 544 offb_init_nodriver(dp, 0); 545 545 }
+2 -2
drivers/video/riva/fbdev.c
··· 1760 1760 NVTRACE_ENTER(); 1761 1761 dp = pci_device_to_OF_node(pd); 1762 1762 for (; dp != NULL; dp = dp->child) { 1763 - disptype = get_property(dp, "display-type", NULL); 1763 + disptype = of_get_property(dp, "display-type", NULL); 1764 1764 if (disptype == NULL) 1765 1765 continue; 1766 1766 if (strncmp(disptype, "LCD", 3) != 0) 1767 1767 continue; 1768 1768 for (i = 0; propnames[i] != NULL; ++i) { 1769 - pedid = get_property(dp, propnames[i], NULL); 1769 + pedid = of_get_property(dp, propnames[i], NULL); 1770 1770 if (pedid != NULL) { 1771 1771 par->EDID = (unsigned char *)pedid; 1772 1772 NVTRACE("LCD found.\n");