Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9482378 authored by Adrian McMenamin's avatar Adrian McMenamin Committed by Paul Mundt
Browse files

maple: fix up whitespace damage. 



This patch is fundamentally about fixing up the whitespace problems
introduced by my previous patch (that brought the code into mainline). A
second patch will follow that will fix memory leaks. The two need to be
applied sequentially.

Signed-off-by: default avatarAdrian McMenamin <adrian@mcmen.demon.co.uk>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 86c0179c

drivers/sh/maple/maple.c

+492 −486
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ int maple_driver_register(struct device_driver *drv) 
	drv->bus = &maple_bus_type;

	return driver_register(drv);

}



EXPORT_SYMBOL_GPL(maple_driver_register);



/* set hardware registers to enable next round of dma */
@@ -102,6 +103,7 @@ void maple_getcond_callback(struct maple_device *dev, 
	dev->function = cpu_to_be32(function);

	dev->when = jiffies;

}



EXPORT_SYMBOL_GPL(maple_getcond_callback);



static int maple_dma_done(void)
@@ -127,6 +129,7 @@ void maple_add_packet(struct mapleq *mq) 
	list_add(&mq->list, &maple_waitq);

	mutex_unlock(&maple_list_lock);

}



EXPORT_SYMBOL_GPL(maple_add_packet);



static struct mapleq *maple_allocq(struct maple_device *dev)
@@ -601,7 +604,8 @@ static int match_maple_bus_driver(struct device *devptr, 
	return 0;

}



static int maple_bus_uevent(struct device *dev, struct kobj_uevent_env *env)

static int maple_bus_uevent(struct device *dev,

			    struct kobj_uevent_env *env)

{

	return 0;

}
@@ -622,6 +626,7 @@ struct bus_type maple_bus_type = { 
	.match = match_maple_bus_driver,

	.uevent = maple_bus_uevent,

};



EXPORT_SYMBOL_GPL(maple_bus_type);



static struct device maple_bus = {
@@ -731,4 +736,5 @@ static int __init maple_bus_init(void) 
	printk(KERN_INFO "Maple bus registration failed\n");

	return retval;

}



subsys_initcall(maple_bus_init);

include/linux/maple.h

+51 −50
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct maple_driver { 
	int (*connect) (struct maple_device * dev);

	void (*disconnect) (struct maple_device * dev);

	struct device_driver drv;

	int registered;

};



void maple_getcond_callback(struct maple_device *dev,