Skip to content

L
linux
Commit 1ff1a78c authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Ralf Baechle
Browse files
Options

[MIPS] MTX-1 code style cleanup 

Fix many errors and warnings given by checkpatch.pl:

- space after opening and before closing parentheses;

- use of C99 // comments;

- leading spaces instead of tabs;

- brace not on the same line with 'else' in the 'if' statement;
  statement;

- printk() without KERN_* facility level;

- using simple_strtol() where strict_strtol() could be used.

- including <asm/gpio.h> instead of <linux/gpio.h>.

In addition to these changes, also do the following:

- insert spaces between operator and its operands;

- replace tab between the function type and name with space in
  mtx1_pci_idsel() declaration;

- remove space after the type cast's closing parenthesis;

- insert missing space before closing brace in the array/structure
  initializers;

- update MontaVista copyright;

- remove Pete Popov's old email address...
Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c3d1d5c8
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 52 deletions
arch/mips/au1000/mtx-1/Makefile
View file @ 1ff1a78c
# #
# Copyright 2003 MontaVista Software Inc. # Copyright 2003 MontaVista Software Inc.
# Author: MontaVista Software, Inc. # Author: MontaVista Software, Inc. <source@mvista.com>
# ppopov@mvista.com or source@mvista.com
# Bruno Randolf <bruno.randolf@4g-systems.biz> # Bruno Randolf <bruno.randolf@4g-systems.biz>
# #
# Makefile for 4G Systems MTX-1 board. # Makefile for 4G Systems MTX-1 board.
......
arch/mips/au1000/mtx-1/board_setup.c
View file @ 1ff1a78c
...@@ -3,9 +3,8 @@ ...@@ -3,9 +3,8 @@
* BRIEF MODULE DESCRIPTION * BRIEF MODULE DESCRIPTION
* 4G Systems MTX-1 board setup. * 4G Systems MTX-1 board setup.
* *
* Copyright 2003 MontaVista Software Inc. * Copyright 2003, 2008 MontaVista Software Inc.
* Author: MontaVista Software, Inc. * Author: MontaVista Software, Inc. <source@mvista.com>
* ppopov@mvista.com or source@mvista.com
* Bruno Randolf <bruno.randolf@4g-systems.biz> * Bruno Randolf <bruno.randolf@4g-systems.biz>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
...@@ -34,7 +33,7 @@ ...@@ -34,7 +33,7 @@
#include <asm/mach-au1x00/au1000.h> #include <asm/mach-au1x00/au1000.h>
extern int (*board_pci_idsel)(unsigned int devsel, int assert); extern int (*board_pci_idsel)(unsigned int devsel, int assert);
int mtx1_pci_idsel(unsigned int devsel, int assert); int mtx1_pci_idsel(unsigned int devsel, int assert);
void board_reset(void) void board_reset(void)
{ {
...@@ -45,36 +44,36 @@ void board_reset(void) ...@@ -45,36 +44,36 @@ void board_reset(void)
void __init board_setup(void) void __init board_setup(void)
{ {
#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
// enable USB power switch /* Enable USB power switch */
au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR ); au_writel(au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR);
au_writel( 0x100000, GPIO2_OUTPUT ); au_writel(0x100000, GPIO2_OUTPUT);
#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */ #endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#if defined(__MIPSEB__) #if defined(__MIPSEB__)
au_writel(0xf | (2<<6) | (1<<4), Au1500_PCI_CFG); au_writel(0xf | (2 << 6) | (1 << 4), Au1500_PCI_CFG);
#else #else
au_writel(0xf, Au1500_PCI_CFG); au_writel(0xf, Au1500_PCI_CFG);
#endif #endif
#endif #endif
// initialize sys_pinfunc: /* Initialize sys_pinfunc */
au_writel( SYS_PF_NI2, SYS_PINFUNC ); au_writel(SYS_PF_NI2, SYS_PINFUNC);
// initialize GPIO /* Initialize GPIO */
au_writel( 0xFFFFFFFF, SYS_TRIOUTCLR ); au_writel(0xFFFFFFFF, SYS_TRIOUTCLR);
au_writel( 0x00000001, SYS_OUTPUTCLR ); // set M66EN (PCI 66MHz) to OFF au_writel(0x00000001, SYS_OUTPUTCLR); /* set M66EN (PCI 66MHz) to OFF */
au_writel( 0x00000008, SYS_OUTPUTSET ); // set PCI CLKRUN# to OFF au_writel(0x00000008, SYS_OUTPUTSET); /* set PCI CLKRUN# to OFF */
au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON au_writel(0x00000002, SYS_OUTPUTSET); /* set EXT_IO3 ON */
au_writel( 0x00000020, SYS_OUTPUTCLR ); // set eth PHY TX_ER to OFF au_writel(0x00000020, SYS_OUTPUTCLR); /* set eth PHY TX_ER to OFF */
// enable LED and set it to green /* Enable LED and set it to green */
au_writel( au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR ); au_writel(au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR);
au_writel( 0x18000800, GPIO2_OUTPUT ); au_writel(0x18000800, GPIO2_OUTPUT);
board_pci_idsel = mtx1_pci_idsel; board_pci_idsel = mtx1_pci_idsel;
printk("4G Systems MTX-1 Board\n"); printk(KERN_INFO "4G Systems MTX-1 Board\n");
} }
int int
...@@ -82,20 +81,18 @@ mtx1_pci_idsel(unsigned int devsel, int assert) ...@@ -82,20 +81,18 @@ mtx1_pci_idsel(unsigned int devsel, int assert)
{ {
#define MTX_IDSEL_ONLY_0_AND_3 0 #define MTX_IDSEL_ONLY_0_AND_3 0
#if MTX_IDSEL_ONLY_0_AND_3 #if MTX_IDSEL_ONLY_0_AND_3
if (devsel != 0 && devsel != 3) { if (devsel != 0 && devsel != 3) {
printk("*** not 0 or 3\n"); printk(KERN_ERR "*** not 0 or 3\n");
return 0; return 0;
} }
#endif #endif
if (assert && devsel != 0) { if (assert && devsel != 0)
// suppress signal to cardbus /* Suppress signal to Cardbus */
au_writel( 0x00000002, SYS_OUTPUTCLR ); // set EXT_IO3 OFF au_writel(0x00000002, SYS_OUTPUTCLR); /* set EXT_IO3 OFF */
} else
else { au_writel(0x00000002, SYS_OUTPUTSET); /* set EXT_IO3 ON */
au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON au_sync_udelay(1);
} return 1;
au_sync_udelay(1);
return 1;
} }
arch/mips/au1000/mtx-1/init.c
View file @ 1ff1a78c
...@@ -3,9 +3,8 @@ ...@@ -3,9 +3,8 @@
* BRIEF MODULE DESCRIPTION * BRIEF MODULE DESCRIPTION
* 4G Systems MTX-1 board setup * 4G Systems MTX-1 board setup
* *
* Copyright 2003 MontaVista Software Inc. * Copyright 2003, 2008 MontaVista Software Inc.
* Author: MontaVista Software, Inc. * Author: MontaVista Software, Inc. <source@mvista.com>
* ppopov@mvista.com or source@mvista.com
* Bruno Randolf <bruno.randolf@4g-systems.biz> * Bruno Randolf <bruno.randolf@4g-systems.biz>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
...@@ -47,8 +46,8 @@ void __init prom_init(void) ...@@ -47,8 +46,8 @@ void __init prom_init(void)
unsigned long memsize; unsigned long memsize;
prom_argc = fw_arg0; prom_argc = fw_arg0;
prom_argv = (char **) fw_arg1; prom_argv = (char **)fw_arg1;
prom_envp = (char **) fw_arg2; prom_envp = (char **)fw_arg2;
prom_init_cmdline(); prom_init_cmdline();
...@@ -56,6 +55,6 @@ void __init prom_init(void) ...@@ -56,6 +55,6 @@ void __init prom_init(void)
if (!memsize_str) if (!memsize_str)
memsize = 0x04000000; memsize = 0x04000000;
else else
memsize = simple_strtol(memsize_str, NULL, 0); memsize = strict_strtol(memsize_str, 0, NULL);
add_memory_region(0, memsize, BOOT_MEM_RAM); add_memory_region(0, memsize, BOOT_MEM_RAM);
} }
arch/mips/au1000/mtx-1/irqmap.c
View file @ 1ff1a78c
...@@ -31,18 +31,18 @@ ...@@ -31,18 +31,18 @@
#include <asm/mach-au1x00/au1000.h> #include <asm/mach-au1x00/au1000.h>
char irq_tab_alchemy[][5] __initdata = { char irq_tab_alchemy[][5] __initdata = {
[0] = { -1, INTA, INTA, INTX, INTX}, /* IDSEL 00 - AdapterA-Slot0 (top) */ [0] = { -1, INTA, INTA, INTX, INTX }, /* IDSEL 00 - AdapterA-Slot0 (top) */
[1] = { -1, INTB, INTA, INTX, INTX}, /* IDSEL 01 - AdapterA-Slot1 (bottom) */ [1] = { -1, INTB, INTA, INTX, INTX }, /* IDSEL 01 - AdapterA-Slot1 (bottom) */
[2] = { -1, INTC, INTD, INTX, INTX}, /* IDSEL 02 - AdapterB-Slot0 (top) */ [2] = { -1, INTC, INTD, INTX, INTX }, /* IDSEL 02 - AdapterB-Slot0 (top) */
[3] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 03 - AdapterB-Slot1 (bottom) */ [3] = { -1, INTD, INTC, INTX, INTX }, /* IDSEL 03 - AdapterB-Slot1 (bottom) */
[4] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 04 - AdapterC-Slot0 (top) */ [4] = { -1, INTA, INTB, INTX, INTX }, /* IDSEL 04 - AdapterC-Slot0 (top) */
[5] = { -1, INTB, INTA, INTX, INTX}, /* IDSEL 05 - AdapterC-Slot1 (bottom) */ [5] = { -1, INTB, INTA, INTX, INTX }, /* IDSEL 05 - AdapterC-Slot1 (bottom) */
[6] = { -1, INTC, INTD, INTX, INTX}, /* IDSEL 06 - AdapterD-Slot0 (top) */ [6] = { -1, INTC, INTD, INTX, INTX }, /* IDSEL 06 - AdapterD-Slot0 (top) */
[7] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 07 - AdapterD-Slot1 (bottom) */ [7] = { -1, INTD, INTC, INTX, INTX }, /* IDSEL 07 - AdapterD-Slot1 (bottom) */
}; };
struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0 },
{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 }, { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
{ AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 }, { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
{ AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 }, { AU1500_GPIO_203, INTC_INT_LOW_LEVEL, 0 },
......
arch/mips/au1000/mtx-1/platform.c
View file @ 1ff1a78c
...@@ -21,11 +21,10 @@ ...@@ -21,11 +21,10 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/gpio.h>
#include <linux/gpio_keys.h> #include <linux/gpio_keys.h>
#include <linux/input.h> #include <linux/input.h>
#include <asm/gpio.h>
static struct gpio_keys_button mtx1_gpio_button[] = { static struct gpio_keys_button mtx1_gpio_button[] = {
{ {
.gpio = 207, .gpio = 207,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7