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

[MIPS] MTX-1 code style cleanup

Browse Source 
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: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Sergei Shtylyov
2008-04-30 23:30:12 +04:00
committed by Ralf Baechle
parent c3d1d5c8c1
commit 1ff1a78cbb
5 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/mips/au1000/mtx-1/Makefile
View File

@@ -1,7 +1,6 @@
# #
# 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.

37
arch/mips/au1000/mtx-1/board_setup.c
View File

@@ -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
@@ -45,7 +44,7 @@ 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) */
@@ -58,23 +57,23 @@ void __init board_setup(void)
#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
@@ -83,18 +82,16 @@ 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); au_sync_udelay(1);
return 1; return 1;
} }

7
arch/mips/au1000/mtx-1/init.c
View File

@@ -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
@@ -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);
} }

3
arch/mips/au1000/mtx-1/platform.c
View File

@@ -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,