[parisc-linux-cvs] iotree merge fixes

[Matthew Wilcox]

Mostly whitespace.  Nothing to see here, move along.

Index: arch/parisc/kernel/drivers.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/drivers.c,v
retrieving revision 1.29
diff -u -p -r1.29 drivers.c
--- drivers.c	2001/10/22 01:36:00	1.29
+++ drivers.c	2001/10/22 15:20:58
@@ -221,18 +221,18 @@ static void print_hwpath(struct parisc_d
 }
 
 struct parisc_device * create_tree_node(char id, struct parisc_device *parent,
-              struct parisc_device **insert)
+		struct parisc_device **insert)
 {
-      struct parisc_device *dev = kmalloc(sizeof(*dev), GFP_KERNEL);
-      if (!dev)
-              return NULL;
-      memset(dev, 0, sizeof(*dev));
-      dev->hw_path = id;
-      dev->id.hw_type = HPHW_FAULTY;
-      dev->parent = parent;
-      dev->sibling = *insert;
-      *insert = dev;
-      return dev;
+	struct parisc_device *dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+	if (!dev)
+		return NULL;
+	memset(dev, 0, sizeof(*dev));
+	dev->hw_path = id;
+	dev->id.hw_type = HPHW_FAULTY;
+	dev->parent = parent;
+	dev->sibling = *insert;
+	*insert = dev;
+	return dev;
 }
 
 /**
@@ -246,11 +246,11 @@ struct parisc_device * create_tree_node(
 struct parisc_device *
 alloc_tree_node(struct parisc_device *parent, char id)
 {
-	struct parisc_device *dev, *prev;
+	struct parisc_device *prev;
 	if ((!parent->child) || (parent->child->hw_path > id)) {
 		return create_tree_node(id, parent, &parent->child);
 	}
-	
+
 	prev = parent->child;
 	if (prev->hw_path == id)
 		return prev;
@@ -258,17 +258,11 @@ alloc_tree_node(struct parisc_device *pa
 	while (prev->sibling && prev->sibling->hw_path < id) {
 		prev = prev->sibling;
 	}
-	
+
 	if ((prev->sibling) && (prev->sibling->hw_path == id))
 		return prev->sibling;
 
-	dev = kmalloc(sizeof(*dev), GFP_KERNEL);
-	memset(dev, 0, sizeof(*dev));
-	dev->hw_path = id;
-	dev->parent = parent;
-	dev->sibling = prev->sibling;
-	prev->sibling = dev;
-	return dev;
+	return create_tree_node(id, parent, &prev->sibling);
 }
 
 static struct parisc_device *find_parisc_device(struct pdc_module_path *modpath)
@@ -396,8 +390,8 @@ static void print_parisc_device(struct p
 
 	print_hwpath(dev, hw_path);
 	printk(KERN_INFO "%d. %s (%d) at 0x%lx [%s], versions 0x%x, 0x%x, 0x%x",
-	       ++count, dev->name, dev->id.hw_type, dev->hpa, hw_path,
-	       dev->id.hversion, dev->id.hversion_rev, dev->id.sversion);
+		++count, dev->name, dev->id.hw_type, dev->hpa, hw_path,
+		dev->id.hversion, dev->id.hversion_rev, dev->id.sversion);
 
 	if (dev->num_addrs > 1) {
 		int k;
Index: arch/parisc/kernel/led.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/led.c,v
retrieving revision 1.23
diff -u -p -r1.23 led.c
--- led.c	2001/10/10 19:01:25	1.23
+++ led.c	2001/10/22 15:21:02
@@ -154,8 +154,7 @@ static int led_proc_read(char *page, cha
 static int led_proc_write(struct file *file, const char *buf, 
 	unsigned long count, void *data)
 {
-	const char *cur = NULL;
-	char lbuf[count];
+	char *cur, lbuf[count];
 	int d;
 
 	if (!capable(CAP_SYS_ADMIN))
@@ -163,7 +162,7 @@ static int led_proc_write(struct file *f
 
 	memset(lbuf, 0, count);
 
-	lcopy_from_user(lbuf, buf, count);
+	copy_from_user(lbuf, buf, count);
 	cur = lbuf;
 
 	/* skip initial spaces */
Index: drivers/gsc/lasi.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/gsc/lasi.c,v
retrieving revision 1.29
diff -u -p -r1.29 lasi.c
--- lasi.c	2001/10/22 01:36:01	1.29
+++ lasi.c	2001/10/22 15:21:03
@@ -237,9 +237,9 @@ lasi_init_chip(struct parisc_device *dev
 		kfree(lasi);
 		return ret;
 	}    
-	
+
 	child = dev->child;
-	if(child->id.hw_type == HPHW_FAULTY)
+	if (child->id.hw_type == HPHW_FAULTY)
 		child = child->child;
 	fixup_bus(child, lasi->busdev_region->data.irqbase);
 

-- 
Revolutions do not require corporate support.