From: Albert H. <he...@us...> - 2008-04-04 19:17:50
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21747/arch/powerpc/platforms/embedded6xx Modified Files: flipper-pic.h flipper-pic.c usbgecko_udbg.c wii_dev.c Log Message: Trivial: - whitespace cleanups - remove obvious documentation - added some comments Index: wii_dev.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/wii_dev.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- wii_dev.c 27 Mar 2008 22:35:26 -0000 1.2 +++ wii_dev.c 4 Apr 2008 19:17:51 -0000 1.3 @@ -23,9 +23,6 @@ { }, }; -/* - * - */ static int __init wii_device_probe(void) { struct device_node *np; Index: usbgecko_udbg.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- usbgecko_udbg.c 26 Mar 2008 19:39:41 -0000 1.1 +++ usbgecko_udbg.c 4 Apr 2008 19:17:51 -0000 1.2 @@ -261,8 +261,7 @@ #ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO /* - * USB Gecko early udbg support initialization. - * The USB Gecko must be inserted in memcard slot B for early debugging. + * USB Gecko early debug support initialization for udbg. * */ void __init udbg_init_debug_usbgecko(void) Index: flipper-pic.h =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/flipper-pic.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- flipper-pic.h 26 Mar 2008 19:34:23 -0000 1.1 +++ flipper-pic.h 4 Apr 2008 19:17:51 -0000 1.2 @@ -15,6 +15,12 @@ #ifndef __FLIPPER_PIC_H #define __FLIPPER_PIC_H +#ifdef CONFIG_WII +#define FLIPPER_NR_IRQS (15) +#else +#define FLIPPER_NR_IRQS (14) +#endif + /* * Each interrupt has a corresponding bit in both * the Interrupt Cause (ICR) and Interrupt Mask (IMR) registers. @@ -23,12 +29,6 @@ * the corresponding bit in IMR. ACK'ing a request simply involves * asserting the corresponding bit in ICR. */ -#ifdef CONFIG_WII -#define FLIPPER_NR_IRQS (15) -#else -#define FLIPPER_NR_IRQS (14) -#endif - #define FLIPPER_ICR 0x00 #define FLIPPER_ICR_RSS (1<<16) /* reset switch state */ Index: flipper-pic.c =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/flipper-pic.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- flipper-pic.c 26 Mar 2008 19:34:23 -0000 1.1 +++ flipper-pic.c 4 Apr 2008 19:17:51 -0000 1.2 @@ -27,11 +27,11 @@ printk(level DRV_MODULE_NAME ": " format , ## arg) -static struct irq_host *flipper_irq_host; - /* + * IRQ chip hooks. * */ + static void flipper_pic_mask_and_ack(unsigned int virq) { int irq = virq_to_hw(virq); @@ -41,9 +41,6 @@ set_bit(irq, io_base + FLIPPER_ICR); } -/* - * - */ static void flipper_pic_ack(unsigned int virq) { int irq = virq_to_hw(virq); @@ -52,9 +49,6 @@ set_bit(irq, io_base + FLIPPER_ICR); } -/* - * - */ static void flipper_pic_mask(unsigned int virq) { int irq = virq_to_hw(virq); @@ -63,9 +57,6 @@ clear_bit(irq, io_base + FLIPPER_IMR); } -/* - * - */ static void flipper_pic_unmask(unsigned int virq) { int irq = virq_to_hw(virq); @@ -74,9 +65,7 @@ set_bit(irq, io_base + FLIPPER_IMR); } -/* - * - */ + static struct irq_chip flipper_pic = { .typename = "flipper-pic", .ack = flipper_pic_ack, @@ -86,8 +75,12 @@ }; /* + * IRQ host hooks. * */ + +static struct irq_host *flipper_irq_host; + static int flipper_pic_map(struct irq_host *h, unsigned int virq, irq_hw_number_t hwirq) { @@ -96,18 +89,12 @@ return 0; } -/* - * - */ static void flipper_pic_unmap(struct irq_host *h, unsigned int irq) { set_irq_chip_data(irq, NULL); set_irq_chip(irq, NULL); } -/* - * - */ static int flipper_pic_match(struct irq_host *h, struct device_node *np) { return 1; @@ -121,8 +108,10 @@ }; /* + * Platform hooks. * */ + struct irq_host * __init flipper_pic_init(struct device_node *np) { struct irq_host *irq_host; @@ -156,9 +145,6 @@ return irq_host; } -/* - * - */ unsigned int flipper_pic_get_irq(void) { void __iomem *io_base = flipper_irq_host->host_data; @@ -175,8 +161,10 @@ } /* + * Probe function. * */ + void __init flipper_pic_probe(void) { struct device_node *np; @@ -193,12 +181,12 @@ } /* - * Misc functions provided by the flipper chipset. + * Misc functions related to the flipper chipset. * */ /* - * + * Resets the platform. */ void flipper_platform_reset(void) { @@ -211,7 +199,7 @@ } /* - * Tells if the reset button is pressed. + * Returns non-zero if the reset button is pressed. */ int flipper_is_reset_button_pressed(void) { |