aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/pmac_zilog.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-04-03 08:40:39 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-12 13:55:19 -0400
commitd05c7a80cf39ae7d0f8d0c3e47c93d51fcd393d3 (patch)
tree6b51334a2427c0392c391d0e0bfab0ab9aae690e /drivers/serial/pmac_zilog.c
parentc4f55b394505fff6ad831d17e36e02dde1c3a8d7 (diff)
[POWERPC] Rename get_property to of_get_property: drivers
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/serial/pmac_zilog.c')
-rw-r--r--drivers/serial/pmac_zilog.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 752ef07516b9..2b163c532e0d 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1452,12 +1452,12 @@ no_dma:
1452 */ 1452 */
1453 if (device_is_compatible(np, "cobalt")) 1453 if (device_is_compatible(np, "cobalt"))
1454 uap->flags |= PMACZILOG_FLAG_IS_INTMODEM; 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 if (conn && (strcmp(conn, "infrared") == 0)) 1456 if (conn && (strcmp(conn, "infrared") == 0))
1457 uap->flags |= PMACZILOG_FLAG_IS_IRDA; 1457 uap->flags |= PMACZILOG_FLAG_IS_IRDA;
1458 uap->port_type = PMAC_SCC_ASYNC; 1458 uap->port_type = PMAC_SCC_ASYNC;
1459 /* 1999 Powerbook G3 has slot-names property instead */ 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 if (slots && slots->count > 0) { 1461 if (slots && slots->count > 0) {
1462 if (strcmp(slots->name, "IrDA") == 0) 1462 if (strcmp(slots->name, "IrDA") == 0)
1463 uap->flags |= PMACZILOG_FLAG_IS_IRDA; 1463 uap->flags |= PMACZILOG_FLAG_IS_IRDA;
@@ -1470,7 +1470,7 @@ no_dma:
1470 struct device_node* i2c_modem = find_devices("i2c-modem"); 1470 struct device_node* i2c_modem = find_devices("i2c-modem");
1471 if (i2c_modem) { 1471 if (i2c_modem) {
1472 const char* mid = 1472 const char* mid =
1473 get_property(i2c_modem, "modem-id", NULL); 1473 of_get_property(i2c_modem, "modem-id", NULL);
1474 if (mid) switch(*mid) { 1474 if (mid) switch(*mid) {
1475 case 0x04 : 1475 case 0x04 :
1476 case 0x05 : 1476 case 0x05 :