Changeset 12387


Ignore:
Timestamp:
2008-08-25T09:28:04+02:00 (8 years ago)
Author:
juhosg
Message:

[adm5120] minor cleanups

Location:
trunk/target/linux/adm5120/files-2.6.26
Files:
1 added
1 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/cellvision/cellvision.h

    r12357 r12387  
    1313#include <linux/init.h> 
    1414#include <linux/gpio.h> 
     15#include <linux/irq.h> 
    1516#include <linux/etherdevice.h> 
    1617 
     
    2021#include <asm/mach-adm5120/adm5120_board.h> 
    2122#include <asm/mach-adm5120/adm5120_platform.h> 
    22 #include <asm/mach-adm5120/adm5120_irq.h> 
    2323 
    2424extern void cellvision_mac_setup(void) __init; 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/board.c

    r12239 r12387  
    1313#include <linux/kernel.h> 
    1414#include <linux/list.h> 
     15#include <linux/string.h> 
    1516#include <linux/device.h> 
    1617#include <linux/platform_device.h> 
     
    2021#include <asm/mach-adm5120/adm5120_info.h> 
    2122#include <asm/mach-adm5120/adm5120_defs.h> 
    22 #include <asm/mach-adm5120/adm5120_irq.h> 
    2323#include <asm/mach-adm5120/adm5120_board.h> 
    2424#include <asm/mach-adm5120/adm5120_platform.h> 
     
    6161 
    6262        if (board->name[0]) 
    63                 memcpy(adm5120_board_name, board->name, ADM5120_BOARD_NAMELEN); 
     63                strlcpy(adm5120_board_name, board->name, ADM5120_BOARD_NAMELEN); 
    6464 
    65         printk(KERN_INFO PFX "board is '%s'\n", board->name); 
     65        printk(KERN_INFO PFX "board is '%s'\n", adm5120_board_name); 
    6666 
    6767        adm5120_gpio_init(); 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/gpio.c

    r12239 r12387  
    1414#include <linux/types.h> 
    1515#include <linux/module.h> 
     16#include <linux/irq.h> 
    1617#include <linux/delay.h> 
    1718#include <linux/platform_device.h> 
    1819#include <linux/io.h> 
     20#include <linux/gpio.h> 
    1921 
    2022#include <asm/addrspace.h> 
    21 #include <linux/gpio.h> 
    2223 
    2324#include <asm/mach-adm5120/adm5120_defs.h> 
    2425#include <asm/mach-adm5120/adm5120_info.h> 
    2526#include <asm/mach-adm5120/adm5120_switch.h> 
    26 #include <asm/mach-adm5120/adm5120_irq.h> 
    2727 
    2828#define GPIO_READ(r)            __raw_readl((r)) 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/irq.c

    r12239 r12387  
    1313#include <linux/kernel.h> 
    1414#include <linux/version.h> 
     15#include <linux/irq.h> 
    1516#include <linux/interrupt.h> 
    1617#include <linux/ioport.h> 
    1718#include <linux/io.h> 
    1819 
    19 #include <asm/irq.h> 
    2020#include <asm/irq_cpu.h> 
    2121#include <asm/mipsregs.h> 
     
    2323 
    2424#include <asm/mach-adm5120/adm5120_defs.h> 
    25 #include <asm/mach-adm5120/adm5120_irq.h> 
    2625 
    2726static void adm5120_intc_irq_unmask(unsigned int irq); 
     
    122121        int irq; 
    123122 
    124         /* dispatch only one IRQ at a time */ 
    125123        status = intc_read_reg(INTC_REG_IRQ_STATUS) & INTC_INT_ALL; 
    126  
    127124        if (status) { 
    128125                irq = ADM5120_INTC_IRQ_BASE + fls(status) - 1; 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/platform.c

    r12357 r12387  
    1717#include <linux/platform_device.h> 
    1818#include <linux/gpio.h> 
     19#include <linux/irq.h> 
    1920 
    2021#include <asm/bootinfo.h> 
     
    2223#include <asm/mach-adm5120/adm5120_defs.h> 
    2324#include <asm/mach-adm5120/adm5120_info.h> 
    24 #include <asm/mach-adm5120/adm5120_irq.h> 
    2525#include <asm/mach-adm5120/adm5120_switch.h> 
    2626#include <asm/mach-adm5120/adm5120_nand.h> 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/prom.c

    r12239 r12387  
    242242        cmd = &_image_cmdline + 8; 
    243243        if (strlen(cmd) > 0) 
    244                 strcpy(arcs_cmdline, cmd); 
    245         else 
    246                 strcpy(arcs_cmdline, CONFIG_CMDLINE); 
     244                strlcpy(arcs_cmdline, cmd, sizeof(arcs_cmdline)); 
    247245 
    248246} 
     
    263261{ 
    264262        prom_detect_machtype(); 
    265  
    266263        prom_init_cmdline(); 
    267264} 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/common/setup.c

    r12239 r12387  
    7070                if (cpu_wait) 
    7171                        cpu_wait(); 
    72         }; 
     72        } 
    7373} 
    7474 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.c

    r12357 r12387  
    3535                for (i = 0; i < 6; i++) { 
    3636                        if (is_valid_ether_addr(myloader_info.macs[i])) 
    37                                 memcpy(myloader_info.macs[i], 
    38                                                 adm5120_eth_macs[i], ETH_ALEN); 
     37                                memcpy(adm5120_eth_macs[i], 
     38                                        myloader_info.macs[i], ETH_ALEN); 
    3939                        else 
    4040                                random_ether_addr(adm5120_eth_macs[i]); 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/compex/compex.h

    r12357 r12387  
    1313#include <linux/init.h> 
    1414#include <linux/gpio.h> 
     15#include <linux/irq.h> 
    1516#include <linux/etherdevice.h> 
    1617 
     
    2021#include <asm/mach-adm5120/adm5120_board.h> 
    2122#include <asm/mach-adm5120/adm5120_platform.h> 
    22 #include <asm/mach-adm5120/adm5120_irq.h> 
    2323 
    2424extern void compex_generic_setup(void) __init; 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/edimax/br-61xx.h

    r12357 r12387  
    1313#include <linux/init.h> 
    1414#include <linux/gpio.h> 
     15#include <linux/irq.h> 
    1516#include <linux/etherdevice.h> 
    1617 
     
    1819 
    1920#include <asm/mach-adm5120/adm5120_board.h> 
    20 #include <asm/mach-adm5120/adm5120_irq.h> 
    2121#include <asm/mach-adm5120/adm5120_platform.h> 
    2222 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/infineon/infineon.h

    r12357 r12387  
    1313#include <linux/init.h> 
    1414#include <linux/gpio.h> 
     15#include <linux/irq.h> 
    1516#include <linux/etherdevice.h> 
    1617 
     
    1819 
    1920#include <asm/mach-adm5120/adm5120_defs.h> 
    20 #include <asm/mach-adm5120/adm5120_irq.h> 
    2121#include <asm/mach-adm5120/adm5120_board.h> 
    2222#include <asm/mach-adm5120/adm5120_platform.h> 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/mikrotik/rb-1xx.h

    r12357 r12387  
    1414#include <linux/delay.h> 
    1515#include <linux/gpio.h> 
     16#include <linux/irq.h> 
    1617#include <linux/etherdevice.h> 
    1718 
     
    1920 
    2021#include <asm/mach-adm5120/adm5120_defs.h> 
    21 #include <asm/mach-adm5120/adm5120_irq.h> 
    2222#include <asm/mach-adm5120/adm5120_nand.h> 
    2323#include <asm/mach-adm5120/adm5120_board.h> 
  • trunk/target/linux/adm5120/files-2.6.26/arch/mips/adm5120/zyxel/p-33x.h

    r12357 r12387  
    1313#include <linux/init.h> 
    1414#include <linux/gpio.h> 
     15#include <linux/irq.h> 
    1516 
    1617#include <asm/bootinfo.h> 
     
    1819#include <asm/mach-adm5120/adm5120_board.h> 
    1920#include <asm/mach-adm5120/adm5120_platform.h> 
    20 #include <asm/mach-adm5120/adm5120_irq.h> 
    2121 
    2222extern void p33x_generic_setup(void) __init; 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/net/adm5120sw.c

    r12239 r12387  
    2525#include <linux/spinlock.h> 
    2626#include <linux/platform_device.h> 
     27#include <linux/io.h> 
     28#include <linux/irq.h> 
    2729 
    2830#include <linux/netdevice.h> 
     
    3032#include <linux/skbuff.h> 
    3133 
    32 #include <linux/io.h> 
    33 #include <linux/irq.h> 
    34  
    3534#include <asm/mipsregs.h> 
    3635 
    3736#include <asm/mach-adm5120/adm5120_info.h> 
    3837#include <asm/mach-adm5120/adm5120_defs.h> 
    39 #include <asm/mach-adm5120/adm5120_irq.h> 
    4038#include <asm/mach-adm5120/adm5120_switch.h> 
    4139 
  • trunk/target/linux/adm5120/files-2.6.26/drivers/watchdog/adm5120_wdt.c

    r12239 r12387  
    1313 * 
    1414 */ 
    15  
    1615#include <linux/module.h> 
    1716#include <linux/types.h> 
     
    1918#include <linux/miscdevice.h> 
    2019#include <linux/watchdog.h> 
     20#include <linux/irq.h> 
    2121 
    2222#include <asm/bootinfo.h> 
     
    2424#include <asm/mach-adm5120/adm5120_info.h> 
    2525#include <asm/mach-adm5120/adm5120_defs.h> 
    26 #include <asm/mach-adm5120/adm5120_irq.h> 
    2726#include <asm/mach-adm5120/adm5120_switch.h> 
    28  
    2927 
    3028#define DEFAULT_TIMEOUT 15              /* (secs) Default is 15 seconds */ 
Note: See TracChangeset for help on using the changeset viewer.