CR ENGR00011205 Move linux includes before other includes

Patch for CR ENGR00011205: Move linux includes before other includes.
This patch moves linux includes before other includes, which is
standard practice in linux kernel development.
Applies to linux 2.6.22 kernel for MX platforms.

http://www.bitshrine.org/gpp/linux-2.6.22-mx-CR-ENGR00011205-Move-linux-includes-before.patch

13 files changed, 32 insertions, 37 deletions

diff --git a/arch/arm/mach-mx3/dma.c b/arch/arm/mach-mx3/dma.c
index fc59ea576f78..94d908f8cf83 100644
--- a/arch/arm/mach-mx3/dma.c
+++ b/arch/arm/mach-mx3/dma.c
@@ -11,10 +11,10 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 #include <linux/init.h>
+#include <linux/device.h>
 #include <asm/dma.h>
 #include <asm/arch/hardware.h>
 
-#include <linux/device.h>
 #include "serial.h"
 
 #define MXC_MMC_BUFFER_ACCESS     0x38
diff --git a/arch/arm/mach-mx3/dvfs.c b/arch/arm/mach-mx3/dvfs.c
index 0c0baab64f97..bab2bd9996bc 100644
--- a/arch/arm/mach-mx3/dvfs.c
+++ b/arch/arm/mach-mx3/dvfs.c
@@ -39,18 +39,18 @@
 #include <linux/fs.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
-#include <asm/uaccess.h>
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
-#include <asm/semaphore.h>
 #include <linux/jiffies.h>
 #include <linux/device.h>
 #include <linux/delay.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/uaccess.h>
+#include <asm/semaphore.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/sdma.h>
-#include <linux/dma-mapping.h>
-
 #include <asm/arch/dvfs.h>
 
 #include "iomux.h"
diff --git a/drivers/mxc/pm/dptc.c b/drivers/mxc/pm/dptc.c
index db28b95fc6f3..2bd575336609 100644
--- a/drivers/mxc/pm/dptc.c
+++ b/drivers/mxc/pm/dptc.c
@@ -37,13 +37,13 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/interrupt.h>
-#include <asm/uaccess.h>
-#include <asm/hardware.h>
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
-#include <asm/semaphore.h>
 #include <linux/jiffies.h>
 #include <linux/platform_device.h>
+#include <asm/uaccess.h>
+#include <asm/hardware.h>
+#include <asm/semaphore.h>
 #include <asm/arch/sdma.h>
 #include <asm/arch/pmic_power.h>
 
diff --git a/drivers/mxc/pm/dptc_mx27.c b/drivers/mxc/pm/dptc_mx27.c
index 138adc26a8a9..9e60294d63dd 100644
--- a/drivers/mxc/pm/dptc_mx27.c
+++ b/drivers/mxc/pm/dptc_mx27.c
@@ -36,11 +36,11 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <asm/uaccess.h>
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
-#include <asm/semaphore.h>
 #include <linux/vmalloc.h>
+#include <asm/uaccess.h>
+#include <asm/semaphore.h>
 #include <asm/arch/pmic_power.h>
 #include <asm/arch/dvfs_dptc_struct.h>
 #include "dvfs_dptc.h"
diff --git a/drivers/mxc/pm/dvfs_dptc.c b/drivers/mxc/pm/dvfs_dptc.c
index 1bd465f02abe..50b22c9defaf 100644
--- a/drivers/mxc/pm/dvfs_dptc.c
+++ b/drivers/mxc/pm/dvfs_dptc.c
@@ -37,12 +37,12 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
-#include <asm/uaccess.h>
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
-#include <asm/semaphore.h>
 #include <linux/jiffies.h>
 #include <linux/vmalloc.h>
+#include <asm/uaccess.h>
+#include <asm/semaphore.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pmic_external.h>
 
diff --git a/drivers/mxc/pmic/mc13783/pmic_audio.c b/drivers/mxc/pmic/mc13783/pmic_audio.c
index 017902384175..d45aecfe2934 100644
--- a/drivers/mxc/pmic/mc13783/pmic_audio.c
+++ b/drivers/mxc/pmic/mc13783/pmic_audio.c
@@ -49,13 +49,13 @@
  */
 
 #include <linux/module.h>
-#include <asm/arch/pmic_audio.h>	/* For PMIC Audio driver interface.    */
-#include <asm/arch/pmic_adc.h>	/* For PMIC ADC driver interface.      */
-
 #include <linux/interrupt.h>	/* For tasklet interface.              */
 #include <linux/platform_device.h>	/* For kernel module interface.        */
 #include <linux/init.h>
 #include <linux/spinlock.h>	/* For spinlock interface.             */
+#include <asm/arch/pmic_audio.h>	/* For PMIC Audio driver interface.    */
+#include <asm/arch/pmic_adc.h>	/* For PMIC ADC driver interface.      */
+
 #include "../core/pmic_config.h"
 
 /*
diff --git a/drivers/mxc/pmic/mc13783/pmic_convity.c b/drivers/mxc/pmic/mc13783/pmic_convity.c
index 52c7cf08821a..8b12343a05b3 100644
--- a/drivers/mxc/pmic/mc13783/pmic_convity.c
+++ b/drivers/mxc/pmic/mc13783/pmic_convity.c
@@ -34,12 +34,12 @@
  * @ingroup PMIC_CONNECTIVITY
  */
 
-#include <asm/arch/pmic_convity.h>	/* For PMIC Connectivity driver interface. */
-#include <asm/arch/pmic_adc.h>	/* For PMIC ADC driver interface.          */
-
 #include <linux/interrupt.h>	/* For tasklet interface.                  */
 #include <linux/platform_device.h>	/* For kernel module interface.            */
 #include <linux/spinlock.h>	/* For spinlock interface.                 */
+#include <asm/arch/pmic_convity.h>	/* For PMIC Connectivity driver interface. */
+#include <asm/arch/pmic_adc.h>	/* For PMIC ADC driver interface.          */
+
 #include "../core/pmic_config.h"
 
 /*
diff --git a/drivers/mxc/pmic/mc13783/pmic_power.c b/drivers/mxc/pmic/mc13783/pmic_power.c
index 7d212b753937..11f96bb7addb 100644
--- a/drivers/mxc/pmic/mc13783/pmic_power.c
+++ b/drivers/mxc/pmic/mc13783/pmic_power.c
@@ -21,8 +21,9 @@
 /*
  * Includes
  */
-#include <asm/ioctl.h>
+
 #include <linux/platform_device.h>
+#include <asm/ioctl.h>
 #include <asm/arch/pmic_power.h>
 
 #include "../core/pmic_config.h"
diff --git a/drivers/mxc/security/mxc_rtic.c b/drivers/mxc/security/mxc_rtic.c
index 2d158ea543dd..3e2fafab6a5e 100644
--- a/drivers/mxc/security/mxc_rtic.c
+++ b/drivers/mxc/security/mxc_rtic.c
@@ -25,15 +25,14 @@
  * @ingroup MXC_Security
  */
 
-#include "mxc_rtic.h"
-#include <asm/arch/clock.h>
-#include <asm/io.h>
-
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #ifdef CONFIG_MXC_RTIC_TEST_DEBUG
 #include <linux/module.h>
 #endif				/* CONFIG_MXC_RTIC_TEST_DEBUG */
+#include <asm/io.h>
+#include <asm/arch/clock.h>
+#include "mxc_rtic.h"
 
 /*!
  * The following api is used to enable the RTIC IP CLK and RTIC HCLK.
diff --git a/drivers/mxc/security/mxc_scc.c b/drivers/mxc/security/mxc_scc.c
index c8257b532639..8f3e23c5e9af 100644
--- a/drivers/mxc/security/mxc_scc.c
+++ b/drivers/mxc/security/mxc_scc.c
@@ -48,10 +48,12 @@
  * @ingroup MXCSCC
  */
 
-#include "mxc_scc_internals.h"
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
+#include "mxc_scc_internals.h"
+
+
 /******************************************************************************
  *
  *  Global / Static Variables
diff --git a/drivers/mxc/security/mxc_scc_internals.h b/drivers/mxc/security/mxc_scc_internals.h
index 70f900cbfd60..e19cbd4c3e72 100644
--- a/drivers/mxc/security/mxc_scc_internals.h
+++ b/drivers/mxc/security/mxc_scc_internals.h
@@ -40,10 +40,8 @@
 #include <linux/kernel.h>	/* General kernel system calls */
 #include <linux/sched.h>	/* for interrupt.h */
 #include <linux/spinlock.h>
-
-#include <asm/io.h>		/* ioremap() */
 #include <linux/interrupt.h>	/* IRQ / interrupt definitions */
-
+#include <asm/io.h>		/* ioremap() */
 #include <asm/arch/mxc_scc_driver.h>
 
 /* Get handle on certain per-platform symbols */
diff --git a/drivers/mxc/security/sahara2/include/linux_port.h b/drivers/mxc/security/sahara2/include/linux_port.h
index 188d0567303c..1fb58366a695 100644
--- a/drivers/mxc/security/sahara2/include/linux_port.h
+++ b/drivers/mxc/security/sahara2/include/linux_port.h
@@ -57,20 +57,11 @@
 #include <linux/sched.h>	/* for interrupt.h */
 #include <linux/fs.h>		/* for inode */
 #include <linux/random.h>
-
-#include <asm/io.h>		/* ioremap() */
-#include <asm/irq.h>
-
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-
 #include <linux/slab.h>		/* kmalloc */
 
-#include <asm/uaccess.h>	/* copy_to_user(), copy_from_user() */
-
-#include <stdarg.h>
-
 #if  LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
 #include <linux/device.h>	/* used in dynamic power management */
 #else
@@ -85,6 +76,10 @@
 
 #include <linux/dmapool.h>
 #include <linux/dma-mapping.h>
+
+#include <asm/io.h>		/* ioremap() */
+#include <asm/irq.h>
+#include <asm/uaccess.h>	/* copy_to_user(), copy_from_user() */
 #include <asm/cacheflush.h>
 
 #ifndef TRUE
diff --git a/include/asm-arm/arch-mxc/gpio.h b/include/asm-arm/arch-mxc/gpio.h
index ffa1e441a8c0..151ec1737eaf 100644
--- a/include/asm-arm/arch-mxc/gpio.h
+++ b/include/asm-arm/arch-mxc/gpio.h
@@ -24,8 +24,8 @@
  * @ingroup GPIO
  */
 
-#include <asm/sizes.h>
 #include <linux/interrupt.h>
+#include <asm/sizes.h>
 #include <asm/hardware.h>
 
 /* gpio related defines */