[adm5120] minor cleanups

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12387 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.h b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.h
index 70742e9..175fbb2 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.h
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.h
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
+#include <linux/irq.h>
 #include <linux/etherdevice.h>
 
 #include <asm/bootinfo.h>
@@ -19,7 +20,6 @@
 #include <asm/mach-adm5120/adm5120_info.h>
 #include <asm/mach-adm5120/adm5120_board.h>
 #include <asm/mach-adm5120/adm5120_platform.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 
 extern void cellvision_mac_setup(void) __init;
 

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c
index bfd4bf8..ffca7e0 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/string.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
 
@@ -19,7 +20,6 @@
 
 #include <asm/mach-adm5120/adm5120_info.h>
 #include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 #include <asm/mach-adm5120/adm5120_board.h>
 #include <asm/mach-adm5120/adm5120_platform.h>
 
@@ -60,9 +60,9 @@ static int __init adm5120_board_setup(void)
                        mips_machtype);
 
        if (board->name[0])
-               memcpy(adm5120_board_name, board->name, ADM5120_BOARD_NAMELEN);
+               strlcpy(adm5120_board_name, board->name, ADM5120_BOARD_NAMELEN);
 
-       printk(KERN_INFO PFX "board is '%s'\n", board->name);
+       printk(KERN_INFO PFX "board is '%s'\n", adm5120_board_name);
 
        adm5120_gpio_init();
 

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/gpio.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/gpio.c
index bce3ddd..aed0038 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/gpio.c
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/gpio.c
@@ -13,17 +13,17 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/module.h>
+#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/gpio.h>
 
 #include <asm/addrspace.h>
-#include <linux/gpio.h>
 
 #include <asm/mach-adm5120/adm5120_defs.h>
 #include <asm/mach-adm5120/adm5120_info.h>
 #include <asm/mach-adm5120/adm5120_switch.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 
 #define GPIO_READ(r)           __raw_readl((r))
 #define GPIO_WRITE(v, r)       __raw_writel((v), (r))

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/irq.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/irq.c
index ce303ec..140a7a0 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/irq.c
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/irq.c
@@ -12,17 +12,16 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/version.h>
+#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
 
-#include <asm/irq.h>
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/bitops.h>
 
 #include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 
 static void adm5120_intc_irq_unmask(unsigned int irq);
 static void adm5120_intc_irq_mask(unsigned int irq);
@@ -121,9 +120,7 @@ static void adm5120_intc_irq_dispatch(void)
        unsigned long status;
        int irq;
 
-       /* dispatch only one IRQ at a time */
        status = intc_read_reg(INTC_REG_IRQ_STATUS) & INTC_INT_ALL;
-
        if (status) {
                irq = ADM5120_INTC_IRQ_BASE + fls(status) - 1;
                do_IRQ(irq);

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/platform.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/platform.c
index 5cae202..9526fe9 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/platform.c
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/platform.c
@@ -16,12 +16,12 @@
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
+#include <linux/irq.h>
 
 #include <asm/bootinfo.h>
 
 #include <asm/mach-adm5120/adm5120_defs.h>
 #include <asm/mach-adm5120/adm5120_info.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 #include <asm/mach-adm5120/adm5120_switch.h>
 #include <asm/mach-adm5120/adm5120_nand.h>
 #include <asm/mach-adm5120/adm5120_platform.h>

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/prom.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/prom.c
index af2bfb5..260c4e5 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/prom.c
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/prom.c
@@ -241,9 +241,7 @@ static void __init prom_init_cmdline(void)
        /* init command line, register a default kernel command line */
        cmd = &_image_cmdline + 8;
        if (strlen(cmd) > 0)
-               strcpy(arcs_cmdline, cmd);
-       else
-               strcpy(arcs_cmdline, CONFIG_CMDLINE);
+               strlcpy(arcs_cmdline, cmd, sizeof(arcs_cmdline));
 
 }
 
@@ -262,7 +260,6 @@ void __init prom_putchar(char ch)
 void __init prom_init(void)
 {
        prom_detect_machtype();
-
        prom_init_cmdline();
 }
 

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/setup.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/setup.c
index 3a31917..0a11774 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/setup.c
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/setup.c
@@ -69,7 +69,7 @@ static void adm5120_halt(void)
        while (1) {
                if (cpu_wait)
                        cpu_wait();
-       };
+       }
 }
 
 void __init plat_time_init(void)

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c
index 8115781..d100bf0 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c
@@ -34,8 +34,8 @@ void __init compex_mac_setup(void)
 
                for (i = 0; i < 6; i++) {
                        if (is_valid_ether_addr(myloader_info.macs[i]))
-                               memcpy(myloader_info.macs[i],
-                                               adm5120_eth_macs[i], ETH_ALEN);
+                               memcpy(adm5120_eth_macs[i],
+                                       myloader_info.macs[i], ETH_ALEN);
                        else
                                random_ether_addr(adm5120_eth_macs[i]);
                }

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.h b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.h
index 739a90d..6242537 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.h
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.h
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
+#include <linux/irq.h>
 #include <linux/etherdevice.h>
 
 #include <asm/bootinfo.h>
@@ -19,6 +20,5 @@
 #include <asm/mach-adm5120/adm5120_info.h>
 #include <asm/mach-adm5120/adm5120_board.h>
 #include <asm/mach-adm5120/adm5120_platform.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 
 extern void compex_generic_setup(void) __init;

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.h b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.h
index d7efda3..f8ad137 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.h
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.h
@@ -12,12 +12,12 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
+#include <linux/irq.h>
 #include <linux/etherdevice.h>
 
 #include <asm/bootinfo.h>
 
 #include <asm/mach-adm5120/adm5120_board.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 #include <asm/mach-adm5120/adm5120_platform.h>
 
 extern void __init br61xx_generic_setup(void) __init;

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.h b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.h
index f3b28e0..2e25a8f 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.h
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.h
@@ -12,12 +12,12 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
+#include <linux/irq.h>
 #include <linux/etherdevice.h>
 
 #include <asm/bootinfo.h>
 
 #include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 #include <asm/mach-adm5120/adm5120_board.h>
 #include <asm/mach-adm5120/adm5120_platform.h>
 #include <asm/mach-adm5120/adm5120_info.h>

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.h b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.h
index d5acef0..1577ed6 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.h
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.h
@@ -13,12 +13,12 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/irq.h>
 #include <linux/etherdevice.h>
 
 #include <asm/bootinfo.h>
 
 #include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 #include <asm/mach-adm5120/adm5120_nand.h>
 #include <asm/mach-adm5120/adm5120_board.h>
 #include <asm/mach-adm5120/adm5120_platform.h>

diff --git a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.h b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.h
index 4817e81..0971cd5 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.h
+++ b/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.h
@@ -12,11 +12,11 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
+#include <linux/irq.h>
 
 #include <asm/bootinfo.h>
 
 #include <asm/mach-adm5120/adm5120_board.h>
 #include <asm/mach-adm5120/adm5120_platform.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 
 extern void p33x_generic_setup(void) __init;

diff --git a/target/linux/adm5120/files-2.6.26/drivers/net/adm5120sw.c b/target/linux/adm5120/files-2.6.26/drivers/net/adm5120sw.c
index ff95ac0..7acc84d 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/drivers/net/adm5120sw.c
+++ b/target/linux/adm5120/files-2.6.26/drivers/net/adm5120sw.c
@@ -24,19 +24,17 @@
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/irq.h>
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 
-#include <linux/io.h>
-#include <linux/irq.h>
-
 #include <asm/mipsregs.h>
 
 #include <asm/mach-adm5120/adm5120_info.h>
 #include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 #include <asm/mach-adm5120/adm5120_switch.h>
 
 #include "adm5120sw.h"

diff --git a/target/linux/adm5120/files-2.6.26/drivers/watchdog/adm5120_wdt.c b/target/linux/adm5120/files-2.6.26/drivers/watchdog/adm5120_wdt.c
index 125a41f..e92a898 100644 (file)
--- a/target/linux/adm5120/files-2.6.26/drivers/watchdog/adm5120_wdt.c
+++ b/target/linux/adm5120/files-2.6.26/drivers/watchdog/adm5120_wdt.c
@@ -12,21 +12,19 @@
  *     2 of the License, or (at your option) any later version.
  *
  */
-
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
+#include <linux/irq.h>
 
 #include <asm/bootinfo.h>
 
 #include <asm/mach-adm5120/adm5120_info.h>
 #include <asm/mach-adm5120/adm5120_defs.h>
-#include <asm/mach-adm5120/adm5120_irq.h>
 #include <asm/mach-adm5120/adm5120_switch.h>
 
-
 #define DEFAULT_TIMEOUT        15              /* (secs) Default is 15 seconds */
 #define MAX_TIMEOUT    327
 /* Max is 327 seconds, counter is 15-bit integer, step is 10 ms */

diff --git a/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_irq.h b/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_irq.h
deleted file mode 100644 (file)
index d0dfb6e..0000000
--- a/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/adm5120_irq.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  ADM5120 specific IRQ numbers
- *
- *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
- *
- */
-#ifndef _MACH_ADM5120_IRQ_H
-#define _MACH_ADM5120_IRQ_H
-
-#include <asm/mach-adm5120/adm5120_intc.h>
-
-#define MIPS_IRQ_HW0           2
-#define MIPS_IRQ_COUNTER       7
-#define MIPS_IRQ_COUNT         8
-
-#define ADM5120_CPU_IRQ_BASE   0
-#define ADM5120_INTC_IRQ_BASE  (ADM5120_CPU_IRQ_BASE + MIPS_IRQ_COUNT)
-#define ADM5120_SWITCH_IRQ_BASE (ADM5120_INTC_IRQ_BASE + INTC_IRQ_COUNT)
-
-#define ADM5120_CPU_IRQ(x)     (ADM5120_CPU_IRQ_BASE + (x))
-#define ADM5120_INTC_IRQ(x)    (ADM5120_INTC_IRQ_BASE + (x))
-
-#define ADM5120_IRQ_INTC       ADM5120_CPU_IRQ(MIPS_IRQ_HW0)
-#define ADM5120_IRQ_COUNTER    ADM5120_CPU_IRQ(MIPS_IRQ_COUNTER)
-
-#define ADM5120_IRQ_TIMER      ADM5120_INTC_IRQ(INTC_IRQ_TIMER)
-#define ADM5120_IRQ_UART0      ADM5120_INTC_IRQ(INTC_IRQ_UART0)
-#define ADM5120_IRQ_UART1      ADM5120_INTC_IRQ(INTC_IRQ_UART1)
-#define ADM5120_IRQ_USBC       ADM5120_INTC_IRQ(INTC_IRQ_USBC)
-#define ADM5120_IRQ_GPIO2      ADM5120_INTC_IRQ(INTC_IRQ_GPIO2)
-#define ADM5120_IRQ_GPIO4      ADM5120_INTC_IRQ(INTC_IRQ_GPIO4)
-#define ADM5120_IRQ_PCI0       ADM5120_INTC_IRQ(INTC_IRQ_PCI0)
-#define ADM5120_IRQ_PCI1       ADM5120_INTC_IRQ(INTC_IRQ_PCI1)
-#define ADM5120_IRQ_PCI2       ADM5120_INTC_IRQ(INTC_IRQ_PCI2)
-#define ADM5120_IRQ_SWITCH     ADM5120_INTC_IRQ(INTC_IRQ_SWITCH)
-
-#endif /* _MACH_ADM5120_IRQ_H */

diff --git a/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/irq.h b/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/irq.h
new file mode 100644 (file)
index 0000000..b0350c8
--- /dev/null
+++ b/target/linux/adm5120/files-2.6.26/include/asm-mips/mach-adm5120/irq.h
@@ -0,0 +1,43 @@
+/*
+ *  ADM5120 specific IRQ numbers
+ *
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+#ifndef _ASM_MIPS_MACH_ADM5120_IRQ_H
+#define _ASM_MIPS_MACH_ADM5120_IRQ_H
+
+#define MIPS_CPU_IRQ_BASE      0
+#define NR_IRQS                        24
+
+#include_next <irq.h>
+
+#include <asm/mach-adm5120/adm5120_intc.h>
+
+#define NO_IRQ                 (-1)
+
+#define MIPS_CPU_IRQ_COUNT     8
+#define MIPS_CPU_IRQ(x)                (MIPS_CPU_IRQ_BASE + (x))
+
+#define ADM5120_INTC_IRQ_BASE  (MIPS_CPU_IRQ_BASE + MIPS_CPU_IRQ_COUNT)
+#define ADM5120_INTC_IRQ(x)    (ADM5120_INTC_IRQ_BASE + (x))
+
+#define ADM5120_IRQ_INTC       MIPS_CPU_IRQ(2)
+#define ADM5120_IRQ_COUNTER    MIPS_CPU_IRQ(7)
+
+#define ADM5120_IRQ_TIMER      ADM5120_INTC_IRQ(INTC_IRQ_TIMER)
+#define ADM5120_IRQ_UART0      ADM5120_INTC_IRQ(INTC_IRQ_UART0)
+#define ADM5120_IRQ_UART1      ADM5120_INTC_IRQ(INTC_IRQ_UART1)
+#define ADM5120_IRQ_USBC       ADM5120_INTC_IRQ(INTC_IRQ_USBC)
+#define ADM5120_IRQ_GPIO2      ADM5120_INTC_IRQ(INTC_IRQ_GPIO2)
+#define ADM5120_IRQ_GPIO4      ADM5120_INTC_IRQ(INTC_IRQ_GPIO4)
+#define ADM5120_IRQ_PCI0       ADM5120_INTC_IRQ(INTC_IRQ_PCI0)
+#define ADM5120_IRQ_PCI1       ADM5120_INTC_IRQ(INTC_IRQ_PCI1)
+#define ADM5120_IRQ_PCI2       ADM5120_INTC_IRQ(INTC_IRQ_PCI2)
+#define ADM5120_IRQ_SWITCH     ADM5120_INTC_IRQ(INTC_IRQ_SWITCH)
+
+#endif /* _ASM_MIPS_MACH_ADM5120_IRQ_H */