Commit d4e75132 authored by Stuart Yoder's avatar Stuart Yoder Committed by Greg Kroah-Hartman

staging: fsl-mc: make order of includes consistent

There are 3 kinds of headers included in the bus driver components--
misc linux/include files, public bus driver includes, and includes
private to the bus driver.

Cleanup the order and formatting of includes in the bus driver to be
consistent:
    #include <linux/include/[file].h>
    #include ../include/[file].h  // public bus driver includes (eventually
                                  // destined for: linux/include/fsl)
    [blank line]
    #include "[file].h"           // private bus driver includes
Signed-off-by: default avatarStuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5143ecf6
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
*/ */
#include "../include/mc-sys.h" #include "../include/mc-sys.h"
#include "../include/mc-cmd.h" #include "../include/mc-cmd.h"
#include "dpmcp.h" #include "dpmcp.h"
#include "dpmcp-cmd.h" #include "dpmcp-cmd.h"
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "../include/mc-sys.h" #include "../include/mc-sys.h"
#include "../include/mc-cmd.h" #include "../include/mc-cmd.h"
#include "../include/dpmng.h" #include "../include/dpmng.h"
#include "dpmng-cmd.h" #include "dpmng-cmd.h"
/** /**
......
...@@ -9,12 +9,13 @@ ...@@ -9,12 +9,13 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include "../include/mc-bus.h"
#include "../include/mc-sys.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/msi.h> #include <linux/msi.h>
#include "../include/mc-bus.h"
#include "../include/mc-sys.h"
#include "dprc-cmd.h" #include "dprc-cmd.h"
#include "fsl-mc-private.h" #include "fsl-mc-private.h"
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "../include/mc-sys.h" #include "../include/mc-sys.h"
#include "../include/mc-cmd.h" #include "../include/mc-cmd.h"
#include "../include/dprc.h" #include "../include/dprc.h"
#include "dprc-cmd.h" #include "dprc-cmd.h"
/** /**
......
...@@ -8,13 +8,14 @@ ...@@ -8,13 +8,14 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include <linux/module.h>
#include <linux/msi.h>
#include "../include/mc-bus.h" #include "../include/mc-bus.h"
#include "../include/mc-sys.h" #include "../include/mc-sys.h"
#include <linux/module.h>
#include "../include/dpbp-cmd.h" #include "../include/dpbp-cmd.h"
#include "../include/dpcon-cmd.h" #include "../include/dpcon-cmd.h"
#include "fsl-mc-private.h" #include "fsl-mc-private.h"
#include <linux/msi.h>
#define FSL_MC_IS_ALLOCATABLE(_obj_type) \ #define FSL_MC_IS_ALLOCATABLE(_obj_type) \
(strcmp(_obj_type, "dpbp") == 0 || \ (strcmp(_obj_type, "dpbp") == 0 || \
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include "../include/mc-bus.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_address.h> #include <linux/of_address.h>
...@@ -19,8 +18,10 @@ ...@@ -19,8 +18,10 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/msi.h> #include <linux/msi.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include "../include/mc-bus.h"
#include "../include/dpmng.h" #include "../include/dpmng.h"
#include "../include/mc-sys.h" #include "../include/mc-sys.h"
#include "fsl-mc-private.h" #include "fsl-mc-private.h"
#include "dprc-cmd.h" #include "dprc-cmd.h"
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include "../include/mc-bus.h"
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/irqchip/arm-gic-v3.h> #include <linux/irqchip/arm-gic-v3.h>
...@@ -17,6 +16,7 @@ ...@@ -17,6 +16,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/irqdomain.h> #include <linux/irqdomain.h>
#include <linux/msi.h> #include <linux/msi.h>
#include "../include/mc-bus.h"
/* /*
* Generate a unique ID identifying the interrupt (only used within the MSI * Generate a unique ID identifying the interrupt (only used within the MSI
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#include "../include/mc-bus.h"
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/irqchip/arm-gic-v3.h> #include <linux/irqchip/arm-gic-v3.h>
...@@ -17,6 +16,7 @@ ...@@ -17,6 +16,7 @@
#include <linux/msi.h> #include <linux/msi.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include "../include/mc-bus.h"
static struct irq_chip its_msi_irq_chip = { static struct irq_chip its_msi_irq_chip = {
.name = "fsl-mc-bus-msi", .name = "fsl-mc-bus-msi",
......
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <linux/io.h>
#include "../include/mc-bus.h" #include "../include/mc-bus.h"
#include "../include/mc-sys.h" #include "../include/mc-sys.h"
#include <linux/io.h>
#include "fsl-mc-private.h" #include "fsl-mc-private.h"
#include "dpmcp.h" #include "dpmcp.h"
......
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "../include/mc-sys.h"
#include "../include/mc-cmd.h"
#include "../include/mc.h"
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/io.h> #include <linux/io.h>
#include "../include/mc-sys.h"
#include "../include/mc-cmd.h"
#include "../include/mc.h"
#include "dpmcp.h" #include "dpmcp.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment