superio/ite/it8728f: Fix headers and prototype location

Try to conform to some kind of standard/consensus for prototype
location. Correct headers while here.

Change-Id: Ie99b1801fa42ddefb9f25d54f326ba7131bd7089
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5499
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

3 files changed, 19 insertions, 44 deletions

diff --git a/src/superio/ite/it8728f/early_serial.c b/src/superio/ite/it8728f/early_serial.c
index 7fbd061ab0..c2632eff34 100644
--- a/src/superio/ite/it8728f/early_serial.c
+++ b/src/superio/ite/it8728f/early_serial.c
@@ -18,7 +18,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "early_serial.h"
+
+#include <arch/io.h>
+#include <device/pnp.h>
+#include "it8728f.h"
 
 /* Superio raw commands */
 static void it8728f_sio_write(device_t dev, u8 index, u8 value)
diff --git a/src/superio/ite/it8728f/early_serial.h b/src/superio/ite/it8728f/early_serial.h
deleted file mode 100644
index a146f4c7a6..0000000000
--- a/src/superio/ite/it8728f/early_serial.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2013 Damien Zammit <damien@zamaudio.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-#ifndef SUPERIO_ITE_IT8728F_EARLY_SERIAL_H
-#define SUPERIO_ITE_IT8728F_EARLY_SERIAL_H
-
-#include <stdint.h>
-#include <arch/io.h>
-#include <device/pnp_def.h>
-#include "it8728f.h"
-
-/*
- * Superio low level commands
- * Pass dev = PNP_DEV(superiobase, LDN)
- */
-void it8728f_reg_write(device_t dev, u8 index, u8 value);
-
-/* Select 24MHz CLKIN (48MHz default). */
-void it8728f_24mhz_clkin(device_t dev);
-
-/* Enable the serial port(s). */
-void it8728f_enable_serial(device_t dev, u16 iobase);
-
-#endif
diff --git a/src/superio/ite/it8728f/it8728f.h b/src/superio/ite/it8728f/it8728f.h
index 603e4679bd..55bdf697bc 100644
--- a/src/superio/ite/it8728f/it8728f.h
+++ b/src/superio/ite/it8728f/it8728f.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SUPERIO_ITE_IT8728F_IT8728F_H
-#define SUPERIO_ITE_IT8728F_IT8728F_H
+#ifndef SUPERIO_ITE_IT8728F_H
+#define SUPERIO_ITE_IT8728F_H
 
 #define IT8728F_FDC  0x00 /* Floppy */
 #define IT8728F_SP1  0x01 /* Com1 */
@@ -39,4 +39,16 @@
 #define IT8728F_CONFIG_REG_CLOCKSEL  0x23 /* Clock Selection. */
 #define IT8728F_CONFIG_REG_SWSUSP    0x24 /* Software Suspend, Flash I/F. 'Special register' */
 
-#endif
+/*
+ * Superio low level commands
+ * Pass dev = PNP_DEV(superiobase, LDN)
+ */
+void it8728f_reg_write(device_t dev, u8 index, u8 value);
+
+/* Select 24MHz CLKIN (48MHz default). */
+void it8728f_24mhz_clkin(device_t dev);
+
+/* Enable the serial port(s). */
+void it8728f_enable_serial(device_t dev, u16 iobase);
+
+#endif /* SUPERIO_ITE_IT8728F_H */