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

diff --git a/arch/arm/mach-mx3/dma.c b/arch/arm/mach-mx3/dma.c
index fc59ea576f78469d0b0784b71368946fee0fe020..94d908f8cf83cc204a8e13609226a8348e3efd82 100644 (file)
--- 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 0c0baab64f972869271f1679d2f42e1c484f2f05..bab2bd9996bc9fb1849f4c4c626d221d3c4c664f 100644 (file)
--- 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 db28b95fc6f38c5edfc920b9c34e2573f0259374..2bd5753366093d660b8ef99d58af7e909fc94400 100644 (file)
--- 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 138adc26a8a932a13a65dd980f4e1fbefbcb4e90..9e60294d63dd9a9dffdee6b4b9a4a9f902700b6c 100644 (file)
--- 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 1bd465f02abe2b2b54408c721ec47630ef214a67..50b22c9defaf597c16e19e706407d6a245aea38b 100644 (file)
--- 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 017902384175f156a22018028df0a0498f3f5e63..d45aecfe29340afe22124c209473caf5fb294f3d 100644 (file)
--- 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 52c7cf08821aa9c9c9d86bab7530c871f41bcd71..8b12343a05b3efa16c8388737a5da25fcd3e4bb3 100644 (file)
--- 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 7d212b7539376835e25235f512c72fd3d34bbdeb..11f96bb7addbb539404bb8c31126d29a7ea8b812 100644 (file)
--- 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 2d158ea543ddb3621f754cea14a4ac77e73cdcad..3e2fafab6a5eac3560b631d35f31b54b6b23950d 100644 (file)
--- 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 c8257b53263966f8d65c1f1d4621c354b742a2db..8f3e23c5e9af64cfdf7d78b9e2fa6f8cc3009855 100644 (file)
--- 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 70f900cbfd60cab75d69074683be9be25dc54edb..e19cbd4c3e7280c5f74eb852f7f4e404f987ef6b 100644 (file)
--- 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 188d0567303ce2dfc0b8c46f34363ac7ca0dac6e..1fb58366a6959bc35c618afe4547917abcd5ed74 100644 (file)
--- 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 ffa1e441a8c0ba59f46244797641993c899803cb..151ec1737eaf25514b5993d0d689f7cc4957c5ca 100644 (file)
--- 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 */