diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 11:57:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 11:57:03 -0500 |
commit | 0bd2cbcdfaff9cb22267d66fc843fa4f73f0c281 (patch) | |
tree | 7d9732bcf5f2f646cb0c2c529c48b454b15d4ae2 /arch/sparc | |
parent | 57cc7215b70856dc6bae8e55b00ecd7b1d7429b1 (diff) | |
parent | a081748735c5feb96b1365e78a5ff0fb6ca7e3a4 (diff) |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
of/flattree: forward declare struct device_node in of_fdt.h
ipmi: explicitly include of_address.h and of_irq.h
sparc: explicitly cast negative phandle checks to s32
powerpc/405: Fix missing #{address,size}-cells in i2c node
powerpc/5200: dts: refactor dts files
powerpc/5200: dts: Change combatible strings on localbus
powerpc/5200: dts: remove unused properties
powerpc/5200: dts: rename nodes to prepare for refactoring dts files
of/flattree: Update dtc to current mainline.
of/device: Don't register disabled devices
powerpc/dts: fix syntax bugs in bluestone.dts
of: Fixes for OF probing on little endian systems
of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
of/flattree: Add of_flat_dt_match() helper function
of_serial: explicitly include of_irq.h
of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
of/flattree: Reorder unflatten_dt_node
of/flattree: Refactor unflatten_dt_node
of/flattree: Add non-boottime device tree functions
of/flattree: Add Kconfig for EARLY_FLATTREE
...
Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/auxio_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/starfire.c | 2 | ||||
-rw-r--r-- | arch/sparc/prom/init_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/prom/init_64.c | 4 | ||||
-rw-r--r-- | arch/sparc/prom/tree_32.c | 17 | ||||
-rw-r--r-- | arch/sparc/prom/tree_64.c | 18 |
6 files changed, 23 insertions, 22 deletions
diff --git a/arch/sparc/kernel/auxio_32.c b/arch/sparc/kernel/auxio_32.c index 35f48837871a..8505e0ac78ba 100644 --- a/arch/sparc/kernel/auxio_32.c +++ b/arch/sparc/kernel/auxio_32.c | |||
@@ -121,7 +121,7 @@ void __init auxio_power_probe(void) | |||
121 | node = prom_searchsiblings(node, "obio"); | 121 | node = prom_searchsiblings(node, "obio"); |
122 | node = prom_getchild(node); | 122 | node = prom_getchild(node); |
123 | node = prom_searchsiblings(node, "power"); | 123 | node = prom_searchsiblings(node, "power"); |
124 | if (node == 0 || node == -1) | 124 | if (node == 0 || (s32)node == -1) |
125 | return; | 125 | return; |
126 | 126 | ||
127 | /* Map the power control register. */ | 127 | /* Map the power control register. */ |
diff --git a/arch/sparc/kernel/starfire.c b/arch/sparc/kernel/starfire.c index a4446c0fb7a1..82281a566bb8 100644 --- a/arch/sparc/kernel/starfire.c +++ b/arch/sparc/kernel/starfire.c | |||
@@ -24,7 +24,7 @@ int this_is_starfire = 0; | |||
24 | void check_if_starfire(void) | 24 | void check_if_starfire(void) |
25 | { | 25 | { |
26 | phandle ssnode = prom_finddevice("/ssp-serial"); | 26 | phandle ssnode = prom_finddevice("/ssp-serial"); |
27 | if (ssnode != 0 && ssnode != -1) | 27 | if (ssnode != 0 && (s32)ssnode != -1) |
28 | this_is_starfire = 1; | 28 | this_is_starfire = 1; |
29 | } | 29 | } |
30 | 30 | ||
diff --git a/arch/sparc/prom/init_32.c b/arch/sparc/prom/init_32.c index d342dba4dd54..0a601b300639 100644 --- a/arch/sparc/prom/init_32.c +++ b/arch/sparc/prom/init_32.c | |||
@@ -60,7 +60,7 @@ void __init prom_init(struct linux_romvec *rp) | |||
60 | prom_nodeops = romvec->pv_nodeops; | 60 | prom_nodeops = romvec->pv_nodeops; |
61 | 61 | ||
62 | prom_root_node = prom_getsibling(0); | 62 | prom_root_node = prom_getsibling(0); |
63 | if((prom_root_node == 0) || (prom_root_node == -1)) | 63 | if ((prom_root_node == 0) || ((s32)prom_root_node == -1)) |
64 | prom_halt(); | 64 | prom_halt(); |
65 | 65 | ||
66 | if((((unsigned long) prom_nodeops) == 0) || | 66 | if((((unsigned long) prom_nodeops) == 0) || |
diff --git a/arch/sparc/prom/init_64.c b/arch/sparc/prom/init_64.c index 9c6ac4b81ded..5016c5e20575 100644 --- a/arch/sparc/prom/init_64.c +++ b/arch/sparc/prom/init_64.c | |||
@@ -35,13 +35,13 @@ void __init prom_init(void *cif_handler, void *cif_stack) | |||
35 | prom_cif_init(cif_handler, cif_stack); | 35 | prom_cif_init(cif_handler, cif_stack); |
36 | 36 | ||
37 | prom_chosen_node = prom_finddevice(prom_chosen_path); | 37 | prom_chosen_node = prom_finddevice(prom_chosen_path); |
38 | if (!prom_chosen_node || prom_chosen_node == -1) | 38 | if (!prom_chosen_node || (s32)prom_chosen_node == -1) |
39 | prom_halt(); | 39 | prom_halt(); |
40 | 40 | ||
41 | prom_stdout = prom_getint(prom_chosen_node, "stdout"); | 41 | prom_stdout = prom_getint(prom_chosen_node, "stdout"); |
42 | 42 | ||
43 | node = prom_finddevice("/openprom"); | 43 | node = prom_finddevice("/openprom"); |
44 | if (!node || node == -1) | 44 | if (!node || (s32)node == -1) |
45 | prom_halt(); | 45 | prom_halt(); |
46 | 46 | ||
47 | prom_getstring(node, "version", prom_version, sizeof(prom_version)); | 47 | prom_getstring(node, "version", prom_version, sizeof(prom_version)); |
diff --git a/arch/sparc/prom/tree_32.c b/arch/sparc/prom/tree_32.c index bc8e4cb87a68..f30e8d038f01 100644 --- a/arch/sparc/prom/tree_32.c +++ b/arch/sparc/prom/tree_32.c | |||
@@ -40,11 +40,11 @@ phandle prom_getchild(phandle node) | |||
40 | { | 40 | { |
41 | phandle cnode; | 41 | phandle cnode; |
42 | 42 | ||
43 | if (node == -1) | 43 | if ((s32)node == -1) |
44 | return 0; | 44 | return 0; |
45 | 45 | ||
46 | cnode = __prom_getchild(node); | 46 | cnode = __prom_getchild(node); |
47 | if (cnode == 0 || cnode == -1) | 47 | if (cnode == 0 || (s32)cnode == -1) |
48 | return 0; | 48 | return 0; |
49 | 49 | ||
50 | return cnode; | 50 | return cnode; |
@@ -72,11 +72,11 @@ phandle prom_getsibling(phandle node) | |||
72 | { | 72 | { |
73 | phandle sibnode; | 73 | phandle sibnode; |
74 | 74 | ||
75 | if (node == -1) | 75 | if ((s32)node == -1) |
76 | return 0; | 76 | return 0; |
77 | 77 | ||
78 | sibnode = __prom_getsibling(node); | 78 | sibnode = __prom_getsibling(node); |
79 | if (sibnode == 0 || sibnode == -1) | 79 | if (sibnode == 0 || (s32)sibnode == -1) |
80 | return 0; | 80 | return 0; |
81 | 81 | ||
82 | return sibnode; | 82 | return sibnode; |
@@ -219,7 +219,7 @@ static char *__prom_nextprop(phandle node, char * oprop) | |||
219 | */ | 219 | */ |
220 | char *prom_nextprop(phandle node, char *oprop, char *buffer) | 220 | char *prom_nextprop(phandle node, char *oprop, char *buffer) |
221 | { | 221 | { |
222 | if (node == 0 || node == -1) | 222 | if (node == 0 || (s32)node == -1) |
223 | return ""; | 223 | return ""; |
224 | 224 | ||
225 | return __prom_nextprop(node, oprop); | 225 | return __prom_nextprop(node, oprop); |
@@ -253,7 +253,7 @@ phandle prom_finddevice(char *name) | |||
253 | if (d != s + 3 && (!*d || *d == '/') | 253 | if (d != s + 3 && (!*d || *d == '/') |
254 | && d <= s + 3 + 8) { | 254 | && d <= s + 3 + 8) { |
255 | node2 = node; | 255 | node2 = node; |
256 | while (node2 && node2 != -1) { | 256 | while (node2 && (s32)node2 != -1) { |
257 | if (prom_getproperty (node2, "reg", (char *)reg, sizeof (reg)) > 0) { | 257 | if (prom_getproperty (node2, "reg", (char *)reg, sizeof (reg)) > 0) { |
258 | if (which_io == reg[0].which_io && phys_addr == reg[0].phys_addr) { | 258 | if (which_io == reg[0].which_io && phys_addr == reg[0].phys_addr) { |
259 | node = node2; | 259 | node = node2; |
@@ -261,7 +261,7 @@ phandle prom_finddevice(char *name) | |||
261 | } | 261 | } |
262 | } | 262 | } |
263 | node2 = prom_getsibling(node2); | 263 | node2 = prom_getsibling(node2); |
264 | if (!node2 || node2 == -1) | 264 | if (!node2 || (s32)node2 == -1) |
265 | break; | 265 | break; |
266 | node2 = prom_searchsiblings(prom_getsibling(node2), nbuf); | 266 | node2 = prom_searchsiblings(prom_getsibling(node2), nbuf); |
267 | } | 267 | } |
@@ -303,6 +303,7 @@ phandle prom_inst2pkg(int inst) | |||
303 | node = (*romvec->pv_v2devops.v2_inst2pkg)(inst); | 303 | node = (*romvec->pv_v2devops.v2_inst2pkg)(inst); |
304 | restore_current(); | 304 | restore_current(); |
305 | spin_unlock_irqrestore(&prom_lock, flags); | 305 | spin_unlock_irqrestore(&prom_lock, flags); |
306 | if (node == -1) return 0; | 306 | if ((s32)node == -1) |
307 | return 0; | ||
307 | return node; | 308 | return node; |
308 | } | 309 | } |
diff --git a/arch/sparc/prom/tree_64.c b/arch/sparc/prom/tree_64.c index d93660048376..92204c3800b5 100644 --- a/arch/sparc/prom/tree_64.c +++ b/arch/sparc/prom/tree_64.c | |||
@@ -43,10 +43,10 @@ inline phandle prom_getchild(phandle node) | |||
43 | { | 43 | { |
44 | phandle cnode; | 44 | phandle cnode; |
45 | 45 | ||
46 | if (node == -1) | 46 | if ((s32)node == -1) |
47 | return 0; | 47 | return 0; |
48 | cnode = __prom_getchild(node); | 48 | cnode = __prom_getchild(node); |
49 | if (cnode == -1) | 49 | if ((s32)cnode == -1) |
50 | return 0; | 50 | return 0; |
51 | return cnode; | 51 | return cnode; |
52 | } | 52 | } |
@@ -56,10 +56,10 @@ inline phandle prom_getparent(phandle node) | |||
56 | { | 56 | { |
57 | phandle cnode; | 57 | phandle cnode; |
58 | 58 | ||
59 | if (node == -1) | 59 | if ((s32)node == -1) |
60 | return 0; | 60 | return 0; |
61 | cnode = prom_node_to_node("parent", node); | 61 | cnode = prom_node_to_node("parent", node); |
62 | if (cnode == -1) | 62 | if ((s32)cnode == -1) |
63 | return 0; | 63 | return 0; |
64 | return cnode; | 64 | return cnode; |
65 | } | 65 | } |
@@ -76,10 +76,10 @@ inline phandle prom_getsibling(phandle node) | |||
76 | { | 76 | { |
77 | phandle sibnode; | 77 | phandle sibnode; |
78 | 78 | ||
79 | if (node == -1) | 79 | if ((s32)node == -1) |
80 | return 0; | 80 | return 0; |
81 | sibnode = __prom_getsibling(node); | 81 | sibnode = __prom_getsibling(node); |
82 | if (sibnode == -1) | 82 | if ((s32)sibnode == -1) |
83 | return 0; | 83 | return 0; |
84 | 84 | ||
85 | return sibnode; | 85 | return sibnode; |
@@ -240,7 +240,7 @@ inline char *prom_firstprop(phandle node, char *buffer) | |||
240 | unsigned long args[7]; | 240 | unsigned long args[7]; |
241 | 241 | ||
242 | *buffer = 0; | 242 | *buffer = 0; |
243 | if (node == -1) | 243 | if ((s32)node == -1) |
244 | return buffer; | 244 | return buffer; |
245 | 245 | ||
246 | args[0] = (unsigned long) prom_nextprop_name; | 246 | args[0] = (unsigned long) prom_nextprop_name; |
@@ -266,7 +266,7 @@ inline char *prom_nextprop(phandle node, const char *oprop, char *buffer) | |||
266 | unsigned long args[7]; | 266 | unsigned long args[7]; |
267 | char buf[32]; | 267 | char buf[32]; |
268 | 268 | ||
269 | if (node == -1) { | 269 | if ((s32)node == -1) { |
270 | *buffer = 0; | 270 | *buffer = 0; |
271 | return buffer; | 271 | return buffer; |
272 | } | 272 | } |
@@ -369,7 +369,7 @@ inline phandle prom_inst2pkg(int inst) | |||
369 | p1275_cmd_direct(args); | 369 | p1275_cmd_direct(args); |
370 | 370 | ||
371 | node = (int) args[4]; | 371 | node = (int) args[4]; |
372 | if (node == -1) | 372 | if ((s32)node == -1) |
373 | return 0; | 373 | return 0; |
374 | return node; | 374 | return node; |
375 | } | 375 | } |