diff options
author | Segher Boessenkool <segher@kernel.crashing.org> | 2006-03-30 07:49:40 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-04-01 06:36:57 -0500 |
commit | 706c8c93ba4865a19e981b9770151a7a63c15794 (patch) | |
tree | 63cbae3a74bfe40adcb1efa9ea5a6e7f6898b8ca /arch/powerpc/kernel/lparcfg.c | |
parent | 8df83028cf52e3bf68dfd35a4b1a044b326a4a99 (diff) |
[PATCH] powerpc/pseries: Change H_StudlyCaps to H_SHOUTING_CAPS
Also cleans up some nearby whitespace problems.
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/lparcfg.c')
-rw-r--r-- | arch/powerpc/kernel/lparcfg.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c index 1b73508ecb2b..8be687700a50 100644 --- a/arch/powerpc/kernel/lparcfg.c +++ b/arch/powerpc/kernel/lparcfg.c | |||
@@ -149,17 +149,17 @@ static void log_plpar_hcall_return(unsigned long rc, char *tag) | |||
149 | if (rc == 0) /* success, return */ | 149 | if (rc == 0) /* success, return */ |
150 | return; | 150 | return; |
151 | /* check for null tag ? */ | 151 | /* check for null tag ? */ |
152 | if (rc == H_Hardware) | 152 | if (rc == H_HARDWARE) |
153 | printk(KERN_INFO | 153 | printk(KERN_INFO |
154 | "plpar-hcall (%s) failed with hardware fault\n", tag); | 154 | "plpar-hcall (%s) failed with hardware fault\n", tag); |
155 | else if (rc == H_Function) | 155 | else if (rc == H_FUNCTION) |
156 | printk(KERN_INFO | 156 | printk(KERN_INFO |
157 | "plpar-hcall (%s) failed; function not allowed\n", tag); | 157 | "plpar-hcall (%s) failed; function not allowed\n", tag); |
158 | else if (rc == H_Authority) | 158 | else if (rc == H_AUTHORITY) |
159 | printk(KERN_INFO | 159 | printk(KERN_INFO |
160 | "plpar-hcall (%s) failed; not authorized to this function\n", | 160 | "plpar-hcall (%s) failed; not authorized to this" |
161 | tag); | 161 | " function\n", tag); |
162 | else if (rc == H_Parameter) | 162 | else if (rc == H_PARAMETER) |
163 | printk(KERN_INFO "plpar-hcall (%s) failed; Bad parameter(s)\n", | 163 | printk(KERN_INFO "plpar-hcall (%s) failed; Bad parameter(s)\n", |
164 | tag); | 164 | tag); |
165 | else | 165 | else |
@@ -209,7 +209,7 @@ static void h_pic(unsigned long *pool_idle_time, unsigned long *num_procs) | |||
209 | unsigned long dummy; | 209 | unsigned long dummy; |
210 | rc = plpar_hcall(H_PIC, 0, 0, 0, 0, pool_idle_time, num_procs, &dummy); | 210 | rc = plpar_hcall(H_PIC, 0, 0, 0, 0, pool_idle_time, num_procs, &dummy); |
211 | 211 | ||
212 | if (rc != H_Authority) | 212 | if (rc != H_AUTHORITY) |
213 | log_plpar_hcall_return(rc, "H_PIC"); | 213 | log_plpar_hcall_return(rc, "H_PIC"); |
214 | } | 214 | } |
215 | 215 | ||
@@ -529,13 +529,13 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf, | |||
529 | retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr, | 529 | retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr, |
530 | *new_weight_ptr); | 530 | *new_weight_ptr); |
531 | 531 | ||
532 | if (retval == H_Success || retval == H_Constrained) { | 532 | if (retval == H_SUCCESS || retval == H_CONSTRAINED) { |
533 | retval = count; | 533 | retval = count; |
534 | } else if (retval == H_Busy) { | 534 | } else if (retval == H_BUSY) { |
535 | retval = -EBUSY; | 535 | retval = -EBUSY; |
536 | } else if (retval == H_Hardware) { | 536 | } else if (retval == H_HARDWARE) { |
537 | retval = -EIO; | 537 | retval = -EIO; |
538 | } else if (retval == H_Parameter) { | 538 | } else if (retval == H_PARAMETER) { |
539 | retval = -EINVAL; | 539 | retval = -EINVAL; |
540 | } else { | 540 | } else { |
541 | printk(KERN_WARNING "%s: received unknown hv return code %ld", | 541 | printk(KERN_WARNING "%s: received unknown hv return code %ld", |