diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-26 08:24:31 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-26 08:24:31 -0400 |
commit | a48141db68e4b9143759435badcc1a49d9022db4 (patch) | |
tree | a7d9e5e259c5aa44131e5d1e280f772edb5cdeb5 /drivers/char | |
parent | 0999ed7f57728c1919b131207e47d9b311cfbd74 (diff) |
Revert "[POWERPC] Rename get_property to of_get_property: drivers"
This reverts commit d05c7a80cf39ae7d0f8d0c3e47c93d51fcd393d3,
which included changes which should go via other subsystem
maintainers.
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/agp/uninorth-agp.c | 2 | ||||
-rw-r--r-- | drivers/char/briq_panel.c | 2 | ||||
-rw-r--r-- | drivers/char/hvc_iseries.c | 2 | ||||
-rw-r--r-- | drivers/char/hvc_vio.c | 2 | ||||
-rw-r--r-- | drivers/char/hvsi.c | 4 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_atmel.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index 42c0a600b1ac..91b062126a68 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
@@ -613,7 +613,7 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev, | |||
613 | uninorth_node = of_find_node_by_name(NULL, "u3"); | 613 | uninorth_node = of_find_node_by_name(NULL, "u3"); |
614 | } | 614 | } |
615 | if (uninorth_node) { | 615 | if (uninorth_node) { |
616 | const int *revprop = of_get_property(uninorth_node, | 616 | const int *revprop = get_property(uninorth_node, |
617 | "device-rev", NULL); | 617 | "device-rev", NULL); |
618 | if (revprop != NULL) | 618 | if (revprop != NULL) |
619 | uninorth_rev = *revprop & 0x3f; | 619 | uninorth_rev = *revprop & 0x3f; |
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c index ed53f541d9e8..c70d52ace8b2 100644 --- a/drivers/char/briq_panel.c +++ b/drivers/char/briq_panel.c | |||
@@ -206,7 +206,7 @@ static int __init briq_panel_init(void) | |||
206 | const char *machine; | 206 | const char *machine; |
207 | int i; | 207 | int i; |
208 | 208 | ||
209 | machine = of_get_property(root, "model", NULL); | 209 | machine = get_property(root, "model", NULL); |
210 | if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) { | 210 | if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) { |
211 | of_node_put(root); | 211 | of_node_put(root); |
212 | return -ENODEV; | 212 | return -ENODEV; |
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c index ec420fe8a908..f144a947bd17 100644 --- a/drivers/char/hvc_iseries.c +++ b/drivers/char/hvc_iseries.c | |||
@@ -575,7 +575,7 @@ static int hvc_find_vtys(void) | |||
575 | (num_found >= VTTY_PORTS)) | 575 | (num_found >= VTTY_PORTS)) |
576 | break; | 576 | break; |
577 | 577 | ||
578 | vtermno = of_get_property(vty, "reg", NULL); | 578 | vtermno = get_property(vty, "reg", NULL); |
579 | if (!vtermno) | 579 | if (!vtermno) |
580 | continue; | 580 | continue; |
581 | 581 | ||
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c index 94a542e20efb..f9c00844d2bf 100644 --- a/drivers/char/hvc_vio.c +++ b/drivers/char/hvc_vio.c | |||
@@ -153,7 +153,7 @@ static int hvc_find_vtys(void) | |||
153 | if (num_found >= MAX_NR_HVC_CONSOLES) | 153 | if (num_found >= MAX_NR_HVC_CONSOLES) |
154 | break; | 154 | break; |
155 | 155 | ||
156 | vtermno = of_get_property(vty, "reg", NULL); | 156 | vtermno = get_property(vty, "reg", NULL); |
157 | if (!vtermno) | 157 | if (!vtermno) |
158 | continue; | 158 | continue; |
159 | 159 | ||
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c index d5a752da322f..50315d6364fd 100644 --- a/drivers/char/hvsi.c +++ b/drivers/char/hvsi.c | |||
@@ -1279,8 +1279,8 @@ static int __init hvsi_console_init(void) | |||
1279 | struct hvsi_struct *hp; | 1279 | struct hvsi_struct *hp; |
1280 | const uint32_t *vtermno, *irq; | 1280 | const uint32_t *vtermno, *irq; |
1281 | 1281 | ||
1282 | vtermno = of_get_property(vty, "reg", NULL); | 1282 | vtermno = get_property(vty, "reg", NULL); |
1283 | irq = of_get_property(vty, "interrupts", NULL); | 1283 | irq = get_property(vty, "interrupts", NULL); |
1284 | if (!vtermno || !irq) | 1284 | if (!vtermno || !irq) |
1285 | continue; | 1285 | continue; |
1286 | 1286 | ||
diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h index 377bc6077c6f..3c852009196e 100644 --- a/drivers/char/tpm/tpm_atmel.h +++ b/drivers/char/tpm/tpm_atmel.h | |||
@@ -52,7 +52,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) | |||
52 | return NULL; | 52 | return NULL; |
53 | } | 53 | } |
54 | 54 | ||
55 | reg = of_get_property(dn, "reg", ®len); | 55 | reg = get_property(dn, "reg", ®len); |
56 | naddrc = of_n_addr_cells(dn); | 56 | naddrc = of_n_addr_cells(dn); |
57 | nsizec = of_n_size_cells(dn); | 57 | nsizec = of_n_size_cells(dn); |
58 | 58 | ||