Commit 26b271be authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc32: some whitespace fixes

From: Paul Mackerras <paulus@samba.org>

This patch does nothing but fix up whitespace in three files in arch/ppc.
It deletes trailing blanks and tabs in several places and joins two lines
that didn't need to be split.
parent ea8b94ab
...@@ -260,7 +260,7 @@ pmac_fix_gatwick_interrupts(struct device_node *gw, int irq_base) ...@@ -260,7 +260,7 @@ pmac_fix_gatwick_interrupts(struct device_node *gw, int irq_base)
node->child->intrs = &gatwick_int_pool[count]; node->child->intrs = &gatwick_int_pool[count];
count += 3; count += 3;
} }
node->child->n_intrs = 3; node->child->n_intrs = 3;
node->child->intrs[0].line = 15+irq_base; node->child->intrs[0].line = 15+irq_base;
node->child->intrs[1].line = 4+irq_base; node->child->intrs[1].line = 4+irq_base;
node->child->intrs[2].line = 5+irq_base; node->child->intrs[2].line = 5+irq_base;
...@@ -279,7 +279,7 @@ pmac_fix_gatwick_interrupts(struct device_node *gw, int irq_base) ...@@ -279,7 +279,7 @@ pmac_fix_gatwick_interrupts(struct device_node *gw, int irq_base)
node->intrs[0].line = 29+irq_base; node->intrs[0].line = 29+irq_base;
printk(KERN_INFO "irq: fixed media-bay on second controller (%d)\n", printk(KERN_INFO "irq: fixed media-bay on second controller (%d)\n",
node->intrs[0].line); node->intrs[0].line);
ya_node = node->child; ya_node = node->child;
while(ya_node) while(ya_node)
{ {
...@@ -501,7 +501,7 @@ void __init pmac_pic_init(void) ...@@ -501,7 +501,7 @@ void __init pmac_pic_init(void)
pmac_irq_hw[i] = (volatile struct pmac_irq_hw*) pmac_irq_hw[i] = (volatile struct pmac_irq_hw*)
(addr + (2 - i) * 0x10); (addr + (2 - i) * 0x10);
} }
/* get addresses of second controller */ /* get addresses of second controller */
irqctrler = irqctrler->next; irqctrler = irqctrler->next;
if (irqctrler && irqctrler->n_addrs > 0) { if (irqctrler && irqctrler->n_addrs > 0) {
......
...@@ -136,7 +136,7 @@ pmac_show_cpuinfo(struct seq_file *m) ...@@ -136,7 +136,7 @@ pmac_show_cpuinfo(struct seq_file *m)
if (pmac_call_feature(PMAC_FTR_GET_MB_INFO, NULL, PMAC_MB_INFO_NAME, (int)&mbname) != 0) if (pmac_call_feature(PMAC_FTR_GET_MB_INFO, NULL, PMAC_MB_INFO_NAME, (int)&mbname) != 0)
mbname = "Unknown"; mbname = "Unknown";
/* find motherboard type */ /* find motherboard type */
seq_printf(m, "machine\t\t: "); seq_printf(m, "machine\t\t: ");
np = find_devices("device-tree"); np = find_devices("device-tree");
...@@ -196,7 +196,7 @@ pmac_show_cpuinfo(struct seq_file *m) ...@@ -196,7 +196,7 @@ pmac_show_cpuinfo(struct seq_file *m)
int n; int n;
struct reg_property *reg = (struct reg_property *) struct reg_property *reg = (struct reg_property *)
get_property(np, "reg", &n); get_property(np, "reg", &n);
if (reg != 0) { if (reg != 0) {
unsigned long total = 0; unsigned long total = 0;
...@@ -207,9 +207,9 @@ pmac_show_cpuinfo(struct seq_file *m) ...@@ -207,9 +207,9 @@ pmac_show_cpuinfo(struct seq_file *m)
} }
/* Checks "l2cr-value" property in the registry */ /* Checks "l2cr-value" property in the registry */
np = find_devices("cpus"); np = find_devices("cpus");
if (np == 0) if (np == 0)
np = find_type_devices("cpu"); np = find_type_devices("cpu");
if (np != 0) { if (np != 0) {
unsigned int *l2cr = (unsigned int *) unsigned int *l2cr = (unsigned int *)
get_property(np, "l2cr-value", NULL); get_property(np, "l2cr-value", NULL);
...@@ -277,9 +277,9 @@ pmac_setup_arch(void) ...@@ -277,9 +277,9 @@ pmac_setup_arch(void)
/* Checks "l2cr-value" property in the registry */ /* Checks "l2cr-value" property in the registry */
if (cur_cpu_spec[0]->cpu_features & CPU_FTR_L2CR) { if (cur_cpu_spec[0]->cpu_features & CPU_FTR_L2CR) {
struct device_node *np = find_devices("cpus"); struct device_node *np = find_devices("cpus");
if (np == 0) if (np == 0)
np = find_type_devices("cpu"); np = find_type_devices("cpu");
if (np != 0) { if (np != 0) {
unsigned int *l2cr = (unsigned int *) unsigned int *l2cr = (unsigned int *)
get_property(np, "l2cr-value", NULL); get_property(np, "l2cr-value", NULL);
...@@ -478,11 +478,11 @@ pmac_restart(char *cmd) ...@@ -478,11 +478,11 @@ pmac_restart(char *cmd)
cuda_poll(); cuda_poll();
break; break;
#endif /* CONFIG_ADB_CUDA */ #endif /* CONFIG_ADB_CUDA */
#ifdef CONFIG_ADB_PMU #ifdef CONFIG_ADB_PMU
case SYS_CTRLER_PMU: case SYS_CTRLER_PMU:
pmu_restart(); pmu_restart();
break; break;
#endif /* CONFIG_ADB_PMU */ #endif /* CONFIG_ADB_PMU */
default: ; default: ;
} }
} }
......
...@@ -800,8 +800,7 @@ prom_init(int r3, int r4, prom_entry pp) ...@@ -800,8 +800,7 @@ prom_init(int r3, int r4, prom_entry pp)
/* First get a handle for the stdout device */ /* First get a handle for the stdout device */
prom = pp; prom = pp;
prom_chosen = call_prom("finddevice", 1, 1, prom_chosen = call_prom("finddevice", 1, 1, "/chosen");
"/chosen");
if (prom_chosen == (void *)-1) if (prom_chosen == (void *)-1)
prom_exit(); prom_exit();
if ((int) call_prom("getprop", 4, 1, prom_chosen, if ((int) call_prom("getprop", 4, 1, prom_chosen,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment