aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornetmonk@netmonk.org <netmonk@netmonk.org>2016-10-01 17:42:41 -0400
committerDavid S. Miller <davem@davemloft.net>2016-10-06 01:46:40 -0400
commit98e98eb6a8a179a444a30d903714fab356726155 (patch)
treeb45d6dc4067fb83c268acc583cd5e42b7a88269a
parent27f145e74c274fa6e40056f3a8d5dc3563bd7369 (diff)
sparc: fixing ident and beautifying code
Good evening, Following LinuxCodingStyle documentation and with the help of Sam, fixed severals identation issues in the code, and few others cosmetic changes And last and i hope least fixing my name :) Signed-off-by : Dominique Carrel <netmonk@netmonk.org> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/prom/ranges.c52
1 files changed, 24 insertions, 28 deletions
diff --git a/arch/sparc/prom/ranges.c b/arch/sparc/prom/ranges.c
index ad143c13bdc0..6d8dc2aa94ce 100644
--- a/arch/sparc/prom/ranges.c
+++ b/arch/sparc/prom/ranges.c
@@ -16,9 +16,8 @@ static struct linux_prom_ranges promlib_obio_ranges[PROMREG_MAX];
16static int num_obio_ranges; 16static int num_obio_ranges;
17 17
18/* Adjust register values based upon the ranges parameters. */ 18/* Adjust register values based upon the ranges parameters. */
19static void 19static void prom_adjust_regs(struct linux_prom_registers *regp, int nregs,
20prom_adjust_regs(struct linux_prom_registers *regp, int nregs, 20 struct linux_prom_ranges *rangep, int nranges)
21 struct linux_prom_ranges *rangep, int nranges)
22{ 21{
23 int regc, rngc; 22 int regc, rngc;
24 23
@@ -34,33 +33,30 @@ prom_adjust_regs(struct linux_prom_registers *regp, int nregs,
34 } 33 }
35} 34}
36 35
37static void 36static void prom_adjust_ranges(struct linux_prom_ranges *ranges1, int nranges1,
38prom_adjust_ranges(struct linux_prom_ranges *ranges1, int nranges1, 37 struct linux_prom_ranges *ranges2, int nranges2)
39 struct linux_prom_ranges *ranges2, int nranges2)
40{ 38{
41 int rng1c, rng2c; 39 int rng1c, rng2c;
42 40
43 for(rng1c=0; rng1c < nranges1; rng1c++) { 41 for (rng1c = 0; rng1c < nranges1; rng1c++) {
44 for(rng2c=0; rng2c < nranges2; rng2c++) 42 for (rng2c = 0; rng2c < nranges2; rng2c++)
45 if(ranges1[rng1c].ot_parent_space == ranges2[rng2c].ot_child_space && 43 if (ranges1[rng1c].ot_parent_space == ranges2[rng2c].ot_child_space &&
46 ranges1[rng1c].ot_parent_base >= ranges2[rng2c].ot_child_base && 44 ranges1[rng1c].ot_parent_base >= ranges2[rng2c].ot_child_base &&
47 ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base > 0U) 45 ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base > 0U)
48 break; 46 break;
49 if(rng2c == nranges2) /* oops */ 47 if (rng2c == nranges2) /* oops */
50 prom_printf("adjust_ranges: Could not find matching bus type...\n"); 48 prom_printf("adjust_ranges: Could not find matching bus type...\n");
51 else if (ranges1[rng1c].ot_parent_base + ranges1[rng1c].or_size > ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size) 49 else if (ranges1[rng1c].ot_parent_base + ranges1[rng1c].or_size > ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size)
52 ranges1[rng1c].or_size = 50 ranges1[rng1c].or_size = ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base;
53 ranges2[rng2c].ot_child_base + ranges2[rng2c].or_size - ranges1[rng1c].ot_parent_base;
54 ranges1[rng1c].ot_parent_space = ranges2[rng2c].ot_parent_space; 51 ranges1[rng1c].ot_parent_space = ranges2[rng2c].ot_parent_space;
55 ranges1[rng1c].ot_parent_base += ranges2[rng2c].ot_parent_base; 52 ranges1[rng1c].ot_parent_base += ranges2[rng2c].ot_parent_base;
56 } 53 }
57} 54}
58 55
59/* Apply probed obio ranges to registers passed, if no ranges return. */ 56/* Apply probed obio ranges to registers passed, if no ranges return. */
60void 57void prom_apply_obio_ranges(struct linux_prom_registers *regs, int nregs)
61prom_apply_obio_ranges(struct linux_prom_registers *regs, int nregs)
62{ 58{
63 if(num_obio_ranges) 59 if (num_obio_ranges)
64 prom_adjust_regs(regs, nregs, promlib_obio_ranges, num_obio_ranges); 60 prom_adjust_regs(regs, nregs, promlib_obio_ranges, num_obio_ranges);
65} 61}
66EXPORT_SYMBOL(prom_apply_obio_ranges); 62EXPORT_SYMBOL(prom_apply_obio_ranges);
@@ -76,40 +72,40 @@ void __init prom_ranges_init(void)
76 node = prom_getchild(prom_root_node); 72 node = prom_getchild(prom_root_node);
77 obio_node = prom_searchsiblings(node, "obio"); 73 obio_node = prom_searchsiblings(node, "obio");
78 74
79 if(obio_node) { 75 if (obio_node) {
80 success = prom_getproperty(obio_node, "ranges", 76 success = prom_getproperty(obio_node, "ranges",
81 (char *) promlib_obio_ranges, 77 (char *) promlib_obio_ranges,
82 sizeof(promlib_obio_ranges)); 78 sizeof(promlib_obio_ranges));
83 if(success != -1) 79 if (success != -1)
84 num_obio_ranges = (success/sizeof(struct linux_prom_ranges)); 80 num_obio_ranges = (success / sizeof(struct linux_prom_ranges));
85 } 81 }
86 82
87 if(num_obio_ranges) 83 if (num_obio_ranges)
88 prom_printf("PROMLIB: obio_ranges %d\n", num_obio_ranges); 84 prom_printf("PROMLIB: obio_ranges %d\n", num_obio_ranges);
89} 85}
90 86
91void prom_apply_generic_ranges(phandle node, phandle parent, 87void prom_apply_generic_ranges(phandle node, phandle parent,
92 struct linux_prom_registers *regs, int nregs) 88 struct linux_prom_registers *regs, int nregs)
93{ 89{
94 int success; 90 int success;
95 int num_ranges; 91 int num_ranges;
96 struct linux_prom_ranges ranges[PROMREG_MAX]; 92 struct linux_prom_ranges ranges[PROMREG_MAX];
97 93
98 success = prom_getproperty(node, "ranges", 94 success = prom_getproperty(node, "ranges",
99 (char *) ranges, 95 (char *) ranges,
100 sizeof (ranges)); 96 sizeof(ranges));
101 if (success != -1) { 97 if (success != -1) {
102 num_ranges = (success/sizeof(struct linux_prom_ranges)); 98 num_ranges = (success / sizeof(struct linux_prom_ranges));
103 if (parent) { 99 if (parent) {
104 struct linux_prom_ranges parent_ranges[PROMREG_MAX]; 100 struct linux_prom_ranges parent_ranges[PROMREG_MAX];
105 int num_parent_ranges; 101 int num_parent_ranges;
106 102
107 success = prom_getproperty(parent, "ranges", 103 success = prom_getproperty(parent, "ranges",
108 (char *) parent_ranges, 104 (char *) parent_ranges,
109 sizeof (parent_ranges)); 105 sizeof(parent_ranges));
110 if (success != -1) { 106 if (success != -1) {
111 num_parent_ranges = (success/sizeof(struct linux_prom_ranges)); 107 num_parent_ranges = (success / sizeof(struct linux_prom_ranges));
112 prom_adjust_ranges (ranges, num_ranges, parent_ranges, num_parent_ranges); 108 prom_adjust_ranges(ranges, num_ranges, parent_ranges, num_parent_ranges);
113 } 109 }
114 } 110 }
115 prom_adjust_regs(regs, nregs, ranges, num_ranges); 111 prom_adjust_regs(regs, nregs, ranges, num_ranges);