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/video/nvidia/nv_of.c | |
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/video/nvidia/nv_of.c')
-rw-r--r-- | drivers/video/nvidia/nv_of.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c index 73afd7eb9977..163a774a1b30 100644 --- a/drivers/video/nvidia/nv_of.c +++ b/drivers/video/nvidia/nv_of.c | |||
@@ -46,15 +46,15 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid) | |||
46 | 46 | ||
47 | for (dp = NULL; | 47 | for (dp = NULL; |
48 | (dp = of_get_next_child(parent, dp)) != NULL;) { | 48 | (dp = of_get_next_child(parent, dp)) != NULL;) { |
49 | pname = of_get_property(dp, "name", NULL); | 49 | pname = get_property(dp, "name", NULL); |
50 | if (!pname) | 50 | if (!pname) |
51 | continue; | 51 | continue; |
52 | len = strlen(pname); | 52 | len = strlen(pname); |
53 | if ((pname[len-1] == 'A' && conn == 1) || | 53 | if ((pname[len-1] == 'A' && conn == 1) || |
54 | (pname[len-1] == 'B' && conn == 2)) { | 54 | (pname[len-1] == 'B' && conn == 2)) { |
55 | for (i = 0; propnames[i] != NULL; ++i) { | 55 | for (i = 0; propnames[i] != NULL; ++i) { |
56 | pedid = of_get_property(dp, | 56 | pedid = get_property(dp, propnames[i], |
57 | propnames[i], NULL); | 57 | NULL); |
58 | if (pedid != NULL) | 58 | if (pedid != NULL) |
59 | break; | 59 | break; |
60 | } | 60 | } |
@@ -65,7 +65,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid) | |||
65 | } | 65 | } |
66 | if (pedid == NULL) { | 66 | if (pedid == NULL) { |
67 | for (i = 0; propnames[i] != NULL; ++i) { | 67 | for (i = 0; propnames[i] != NULL; ++i) { |
68 | pedid = of_get_property(parent, propnames[i], NULL); | 68 | pedid = get_property(parent, propnames[i], NULL); |
69 | if (pedid != NULL) | 69 | if (pedid != NULL) |
70 | break; | 70 | break; |
71 | } | 71 | } |