lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

maple: fix up whitespace damage.

Browse Source 
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: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Adrian McMenamin
2008-02-06 22:46:21 +00:00
committed by Paul Mundt
parent 86c0179c93
commit b948237891
2 changed files with 496 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/sh/maple/maple.c
View File

@@ -73,6 +73,7 @@ int maple_driver_register(struct device_driver *drv)
drv->bus = &maple_bus_type; drv->bus = &maple_bus_type;
return driver_register(drv); return driver_register(drv);
} }
EXPORT_SYMBOL_GPL(maple_driver_register); EXPORT_SYMBOL_GPL(maple_driver_register);
/* set hardware registers to enable next round of dma */ /* 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->function = cpu_to_be32(function);
dev->when = jiffies; dev->when = jiffies;
} }
EXPORT_SYMBOL_GPL(maple_getcond_callback); EXPORT_SYMBOL_GPL(maple_getcond_callback);
static int maple_dma_done(void) static int maple_dma_done(void)
@@ -127,6 +129,7 @@ void maple_add_packet(struct mapleq *mq)
list_add(&mq->list, &maple_waitq); list_add(&mq->list, &maple_waitq);
mutex_unlock(&maple_list_lock); mutex_unlock(&maple_list_lock);
} }
EXPORT_SYMBOL_GPL(maple_add_packet); EXPORT_SYMBOL_GPL(maple_add_packet);
static struct mapleq *maple_allocq(struct maple_device *dev) static struct mapleq *maple_allocq(struct maple_device *dev)
@@ -601,7 +604,8 @@ static int match_maple_bus_driver(struct device *devptr,
return 0; 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; return 0;
} }
@@ -622,6 +626,7 @@ struct bus_type maple_bus_type = {
.match = match_maple_bus_driver, .match = match_maple_bus_driver,
.uevent = maple_bus_uevent, .uevent = maple_bus_uevent,
}; };
EXPORT_SYMBOL_GPL(maple_bus_type); EXPORT_SYMBOL_GPL(maple_bus_type);
static struct device maple_bus = { static struct device maple_bus = {
@@ -706,29 +711,30 @@ static int __init maple_bus_init(void)
return 0; return 0;
cleanup_cache: cleanup_cache:
kmem_cache_destroy(maple_queue_cache); kmem_cache_destroy(maple_queue_cache);
cleanup_bothirqs: cleanup_bothirqs:
free_irq(HW_EVENT_VSYNC, 0); free_irq(HW_EVENT_VSYNC, 0);
cleanup_irq: cleanup_irq:
free_irq(HW_EVENT_MAPLE_DMA, 0); free_irq(HW_EVENT_MAPLE_DMA, 0);
cleanup_dma: cleanup_dma:
free_pages((unsigned long) maple_sendbuf, MAPLE_DMA_PAGES); free_pages((unsigned long) maple_sendbuf, MAPLE_DMA_PAGES);
cleanup_basic: cleanup_basic:
driver_unregister(&maple_dummy_driver.drv); driver_unregister(&maple_dummy_driver.drv);
cleanup_bus: cleanup_bus:
bus_unregister(&maple_bus_type); bus_unregister(&maple_bus_type);
cleanup_device: cleanup_device:
device_unregister(&maple_bus); device_unregister(&maple_bus);
cleanup: cleanup:
printk(KERN_INFO "Maple bus registration failed\n"); printk(KERN_INFO "Maple bus registration failed\n");
return retval; return retval;
} }
subsys_initcall(maple_bus_init); subsys_initcall(maple_bus_init);

1
include/linux/maple.h
View File

@@ -65,6 +65,7 @@ struct maple_driver {
int (*connect) (struct maple_device * dev); int (*connect) (struct maple_device * dev);
void (*disconnect) (struct maple_device * dev); void (*disconnect) (struct maple_device * dev);
struct device_driver drv; struct device_driver drv;
int registered;
}; };
void maple_getcond_callback(struct maple_device *dev, void maple_getcond_callback(struct maple_device *dev,