From 6d51f6b2e8f4633a85d983b5bf8dcfc429df4c6c Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Wed, 23 Apr 2014 17:01:45 +1000 Subject: [PATCH] superio/fintek/*: Fix header style Remove some redundant includes. Fix repetitiveness in include guards and strip some misplaced tabs for whitespaces. Change-Id: I1f0bf6951cc6714f63e88b323754515fb02c089c Signed-off-by: Edward O'Callaghan Reviewed-on: http://review.coreboot.org/5572 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/superio/fintek/f71805f/f71805f.h | 14 +++++++------- src/superio/fintek/f71859/f71859.h | 6 +++--- src/superio/fintek/f71863fg/chip.h | 1 - src/superio/fintek/f71863fg/f71863fg.h | 20 ++++++++++---------- src/superio/fintek/f71869ad/chip.h | 1 - src/superio/fintek/f71869ad/f71869ad.h | 6 +++--- src/superio/fintek/f71872/f71872.h | 6 +++--- src/superio/fintek/f71889/chip.h | 1 - src/superio/fintek/f71889/f71889.h | 6 +++--- src/superio/fintek/f81865f/f81865f.h | 22 +++++++++++----------- 10 files changed, 40 insertions(+), 43 deletions(-) diff --git a/src/superio/fintek/f71805f/f71805f.h b/src/superio/fintek/f71805f/f71805f.h index 6aae58f299..1033ea2de6 100644 --- a/src/superio/fintek/f71805f/f71805f.h +++ b/src/superio/fintek/f71805f/f71805f.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SUPERIO_FINTEK_F71805F_F71805F_H -#define SUPERIO_FINTEK_F71805F_F71805F_H +#ifndef SUPERIO_FINTEK_F71805F_H +#define SUPERIO_FINTEK_F71805F_H /* * Datasheet: @@ -32,12 +32,12 @@ /* Logical Device Numbers (LDN). */ #define F71805F_FDC 0x00 /* Floppy */ #define F71805F_SP1 0x01 /* UART1 */ -#define F71805F_SP2 0x02 /* UART2 */ +#define F71805F_SP2 0x02 /* UART2 */ #define F71805F_PP 0x03 /* Parallel port */ -#define F71805F_HWM 0x04 /* Hardware monitor */ -#define F71805F_GPIO 0x06 /* General Purpose I/O (GPIO) */ -#define F71805F_PME 0x0a /* Power Management Events (PME) */ +#define F71805F_HWM 0x04 /* Hardware monitor */ +#define F71805F_GPIO 0x06 /* General Purpose I/O (GPIO) */ +#define F71805F_PME 0x0a /* Power Management Events (PME) */ void f71805f_enable_serial(device_t dev, u16 iobase); -#endif /* SUPERIO_FINTEK_F71805F_F71805F_H */ +#endif /* SUPERIO_FINTEK_F71805F_H */ diff --git a/src/superio/fintek/f71859/f71859.h b/src/superio/fintek/f71859/f71859.h index 580fa34e9d..ab114a4540 100644 --- a/src/superio/fintek/f71859/f71859.h +++ b/src/superio/fintek/f71859/f71859.h @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SUPERIO_FINTEK_F71859_F71859_H -#define SUPERIO_FINTEK_F71859_F71859_H +#ifndef SUPERIO_FINTEK_F71859_H +#define SUPERIO_FINTEK_F71859_H /* Logical Device Numbers (LDN). */ #define F71859_SP1 0x03 /* UART1 */ void f71859_enable_serial(device_t dev, u16 iobase); -#endif /* SUPERIO_FINTEK_F71859_F71859_H */ +#endif /* SUPERIO_FINTEK_F71859_H */ diff --git a/src/superio/fintek/f71863fg/chip.h b/src/superio/fintek/f71863fg/chip.h index 4d2652e0d3..a2c04d7c87 100644 --- a/src/superio/fintek/f71863fg/chip.h +++ b/src/superio/fintek/f71863fg/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_FINTEK_F71863FG_CHIP_H #include -#include struct superio_fintek_f71863fg_config { diff --git a/src/superio/fintek/f71863fg/f71863fg.h b/src/superio/fintek/f71863fg/f71863fg.h index 127a120ba7..c29ddbe05e 100644 --- a/src/superio/fintek/f71863fg/f71863fg.h +++ b/src/superio/fintek/f71863fg/f71863fg.h @@ -18,21 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SUPERIO_FINTEK_F71863FG_F71863FG_H -#define SUPERIO_FINTEK_F71863FG_F71863FG_H +#ifndef SUPERIO_FINTEK_F71863FG_H +#define SUPERIO_FINTEK_F71863FG_H /* Logical Device Numbers (LDN). */ #define F71863FG_FDC 0x00 /* Floppy */ #define F71863FG_SP1 0x01 /* UART1 */ -#define F71863FG_SP2 0x02 /* UART2 */ +#define F71863FG_SP2 0x02 /* UART2 */ #define F71863FG_PP 0x03 /* Parallel port */ -#define F71863FG_HWM 0x04 /* Hardware monitor */ -#define F71863FG_KBC 0x05 /* PS/2 keyboard and mouse */ -#define F71863FG_GPIO 0x06 /* General Purpose I/O (GPIO) */ -#define F71863FG_VID 0x07 /* VID */ -#define F71863FG_SPI 0x08 /* SPI */ -#define F71863FG_PME 0x0a /* Power Management Events (PME) and ACPI */ +#define F71863FG_HWM 0x04 /* Hardware monitor */ +#define F71863FG_KBC 0x05 /* PS/2 keyboard and mouse */ +#define F71863FG_GPIO 0x06 /* General Purpose I/O (GPIO) */ +#define F71863FG_VID 0x07 /* VID */ +#define F71863FG_SPI 0x08 /* SPI */ +#define F71863FG_PME 0x0a /* Power Management Events (PME) and ACPI */ void f71863fg_enable_serial(device_t dev, u16 iobase); -#endif /* SUPERIO_FINTEK_F71863FG_F71863FG_H */ +#endif /* SUPERIO_FINTEK_F71863FG_H */ diff --git a/src/superio/fintek/f71869ad/chip.h b/src/superio/fintek/f71869ad/chip.h index 5b18c33f48..ea2ee6ed50 100644 --- a/src/superio/fintek/f71869ad/chip.h +++ b/src/superio/fintek/f71869ad/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_FINTEK_F71869AD_CHIP_H #include -#include struct superio_fintek_f71869ad_config { struct pc_keyboard keyboard; diff --git a/src/superio/fintek/f71869ad/f71869ad.h b/src/superio/fintek/f71869ad/f71869ad.h index abc0260fea..43a4397451 100644 --- a/src/superio/fintek/f71869ad/f71869ad.h +++ b/src/superio/fintek/f71869ad/f71869ad.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SUPERIO_FINTEK_F71869AD_F71869AD_H -#define SUPERIO_FINTEK_F71869AD_F71869AD_H +#ifndef SUPERIO_FINTEK_F71869AD_H +#define SUPERIO_FINTEK_F71869AD_H /* Logical Device Numbers (LDN). */ #define F71869AD_FDC 0x00 /* Floppy */ @@ -34,4 +34,4 @@ void f71869ad_enable_serial(device_t dev, u16 iobase); -#endif /* SUPERIO_FINTEK_F71869AD_F71869AD_H */ +#endif /* SUPERIO_FINTEK_F71869AD_H */ diff --git a/src/superio/fintek/f71872/f71872.h b/src/superio/fintek/f71872/f71872.h index 577f8d11d9..fb8076248a 100644 --- a/src/superio/fintek/f71872/f71872.h +++ b/src/superio/fintek/f71872/f71872.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SUPERIO_FINTEK_F71872_F71872_H -#define SUPERIO_FINTEK_F71872_F71872_H +#ifndef SUPERIO_FINTEK_F71872_H +#define SUPERIO_FINTEK_F71872_H /* Logical Device Numbers (LDN). */ #define F71872_FDC 0x00 /* Floppy */ @@ -34,4 +34,4 @@ void f71872_enable_serial(device_t dev, u16 iobase); -#endif /* SUPERIO_FINTEK_F71872_F71872_H */ +#endif /* SUPERIO_FINTEK_F71872_H */ diff --git a/src/superio/fintek/f71889/chip.h b/src/superio/fintek/f71889/chip.h index 50312ad2ef..e5a15d3354 100644 --- a/src/superio/fintek/f71889/chip.h +++ b/src/superio/fintek/f71889/chip.h @@ -22,7 +22,6 @@ #define SUPERIO_FINTEK_F71889_CHIP_H #include -#include struct superio_fintek_f71889_config { diff --git a/src/superio/fintek/f71889/f71889.h b/src/superio/fintek/f71889/f71889.h index 6dc43b36a2..72148f4f62 100644 --- a/src/superio/fintek/f71889/f71889.h +++ b/src/superio/fintek/f71889/f71889.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SUPERIO_FINTEK_F71889_F71889_H -#define SUPERIO_FINTEK_F71889_F71889_H +#ifndef SUPERIO_FINTEK_F71889_H +#define SUPERIO_FINTEK_F71889_H /* Logical Device Numbers (LDN). */ #define F71889_FDC 0x00 /* Floppy */ @@ -36,4 +36,4 @@ void f71889_enable_serial(device_t dev, u16 iobase); -#endif /* SUPERIO_FINTEK_F71889_F71889_H */ +#endif /* SUPERIO_FINTEK_F71889_H */ diff --git a/src/superio/fintek/f81865f/f81865f.h b/src/superio/fintek/f81865f/f81865f.h index ccf41af4aa..99b769884d 100644 --- a/src/superio/fintek/f81865f/f81865f.h +++ b/src/superio/fintek/f81865f/f81865f.h @@ -22,19 +22,19 @@ * Datasheet: * - Name: F81865F/F-I */ -#ifndef SUPERIO_FINTEK_F81865_F81865_H -#define SUPERIO_FINTEK_F81865_F81865_H +#ifndef SUPERIO_FINTEK_F81865_H +#define SUPERIO_FINTEK_F81865_H /* Logical Device Numbers (LDN). */ -#define F81865F_FDC 0x00 /* Floppy */ -#define F81865F_SP1 0x10 /* UART1 */ -#define F81865F_SP2 0x11 /* UART2 */ -#define F81865F_PP 0x03 /* Parallel Port */ -#define F81865F_HWM 0x04 /* Hardware Monitor */ -#define F81865F_KBC 0x05 /* Keyboard/Mouse */ -#define F81865F_GPIO 0x06 /* General Purpose I/O (GPIO) */ -#define F81865F_PME 0x0a /* Power Management Events (PME) */ +#define F81865F_FDC 0x00 /* Floppy */ +#define F81865F_SP1 0x10 /* UART1 */ +#define F81865F_SP2 0x11 /* UART2 */ +#define F81865F_PP 0x03 /* Parallel Port */ +#define F81865F_HWM 0x04 /* Hardware Monitor */ +#define F81865F_KBC 0x05 /* Keyboard/Mouse */ +#define F81865F_GPIO 0x06 /* General Purpose I/O (GPIO) */ +#define F81865F_PME 0x0a /* Power Management Events (PME) */ void f81865f_enable_serial(device_t dev, u16 iobase); -#endif /* SUPERIO_FINTEK_F81865_F81865_H */ +#endif /* SUPERIO_FINTEK_F81865_H */