Commit 53ca8854 authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds

[PATCH] ppc64: whitespace cleanup in prom.c

This patch, originally from Linas Vepstas, cleans up some wonky indentation
and other formatting issues in arch/ppc64/kernel/prom.c.  It does not change
any actual code.
Signed-off-by: default avatarLinas Vepstas <linas@linas.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1ffdc2aa
...@@ -775,7 +775,7 @@ static void __init prom_initialize_tce_table(void) ...@@ -775,7 +775,7 @@ static void __init prom_initialize_tce_table(void)
/* Keep the old logic in tack to avoid regression. */ /* Keep the old logic in tack to avoid regression. */
if (compatible[0] != 0) { if (compatible[0] != 0) {
if((strstr(compatible, RELOC("python")) == NULL) && if ((strstr(compatible, RELOC("python")) == NULL) &&
(strstr(compatible, RELOC("Speedwagon")) == NULL) && (strstr(compatible, RELOC("Speedwagon")) == NULL) &&
(strstr(compatible, RELOC("Winnipeg")) == NULL)) (strstr(compatible, RELOC("Winnipeg")) == NULL))
continue; continue;
...@@ -2295,7 +2295,7 @@ finish_node(struct device_node *np, unsigned long mem_start, ...@@ -2295,7 +2295,7 @@ finish_node(struct device_node *np, unsigned long mem_start,
return mem_start; return mem_start;
} }
/* /**
* finish_device_tree is called once things are running normally * finish_device_tree is called once things are running normally
* (i.e. with text and data mapped to the address they were linked at). * (i.e. with text and data mapped to the address they were linked at).
* It traverses the device tree and fills in the name, type, * It traverses the device tree and fills in the name, type,
...@@ -2346,7 +2346,7 @@ prom_n_size_cells(struct device_node* np) ...@@ -2346,7 +2346,7 @@ prom_n_size_cells(struct device_node* np)
return 1; return 1;
} }
/* /**
* Work out the sense (active-low level / active-high edge) * Work out the sense (active-low level / active-high edge)
* of each interrupt from the device tree. * of each interrupt from the device tree.
*/ */
...@@ -2368,7 +2368,7 @@ prom_get_irq_senses(unsigned char *senses, int off, int max) ...@@ -2368,7 +2368,7 @@ prom_get_irq_senses(unsigned char *senses, int off, int max)
} }
} }
/* /**
* Construct and return a list of the device_nodes with a given name. * Construct and return a list of the device_nodes with a given name.
*/ */
struct device_node * struct device_node *
...@@ -2387,7 +2387,7 @@ find_devices(const char *name) ...@@ -2387,7 +2387,7 @@ find_devices(const char *name)
return head; return head;
} }
/* /**
* Construct and return a list of the device_nodes with a given type. * Construct and return a list of the device_nodes with a given type.
*/ */
struct device_node * struct device_node *
...@@ -2406,7 +2406,7 @@ find_type_devices(const char *type) ...@@ -2406,7 +2406,7 @@ find_type_devices(const char *type)
return head; return head;
} }
/* /**
* Returns all nodes linked together * Returns all nodes linked together
*/ */
struct device_node * struct device_node *
...@@ -2423,7 +2423,7 @@ find_all_nodes(void) ...@@ -2423,7 +2423,7 @@ find_all_nodes(void)
return head; return head;
} }
/* Checks if the given "compat" string matches one of the strings in /** Checks if the given "compat" string matches one of the strings in
* the device's "compatible" property * the device's "compatible" property
*/ */
int int
...@@ -2447,7 +2447,7 @@ device_is_compatible(struct device_node *device, const char *compat) ...@@ -2447,7 +2447,7 @@ device_is_compatible(struct device_node *device, const char *compat)
} }
/* /**
* Indicates whether the root node has a given value in its * Indicates whether the root node has a given value in its
* compatible property. * compatible property.
*/ */
...@@ -2465,7 +2465,7 @@ machine_is_compatible(const char *compat) ...@@ -2465,7 +2465,7 @@ machine_is_compatible(const char *compat)
return rc; return rc;
} }
/* /**
* Construct and return a list of the device_nodes with a given type * Construct and return a list of the device_nodes with a given type
* and compatible property. * and compatible property.
*/ */
...@@ -2488,7 +2488,7 @@ find_compatible_devices(const char *type, const char *compat) ...@@ -2488,7 +2488,7 @@ find_compatible_devices(const char *type, const char *compat)
return head; return head;
} }
/* /**
* Find the device_node with a given full_name. * Find the device_node with a given full_name.
*/ */
struct device_node * struct device_node *
...@@ -2971,12 +2971,11 @@ static int of_finish_dynamic_node(struct device_node *node) ...@@ -2971,12 +2971,11 @@ static int of_finish_dynamic_node(struct device_node *node)
/* fixing up iommu_table */ /* fixing up iommu_table */
if(strcmp(node->name, "pci") == 0 && if (strcmp(node->name, "pci") == 0 &&
get_property(node, "ibm,dma-window", NULL)) { get_property(node, "ibm,dma-window", NULL)) {
node->bussubno = node->busno; node->bussubno = node->busno;
iommu_devnode_init(node); iommu_devnode_init(node);
} } else
else
node->iommu_table = parent->iommu_table; node->iommu_table = parent->iommu_table;
out: out:
......
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