ARM: integrator: localize the lm.h header

As we move toward multiplatform support for the Integrator family
we need to localize all <mach/*> headers. This moves the lm.h
header down to the machine folder as it is not used outside it
anyway.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Jonathan Austin <jonathan.austin@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index d9b784824808c77ecd90d6f6d4c6d9c64dcbb4dd..a90e83fe8776c668d61f1e122306eedc258f7081 100644 (file)
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -25,9 +25,9 @@
 #include <linux/slab.h>
 #include <linux/irqchip/arm-vic.h>
 
-#include <mach/lm.h>
 #include <mach/impd1.h>
 #include <asm/sizes.h>
+#include "lm.h"
 
 static int module_id;
 

diff --git a/arch/arm/mach-integrator/include/mach/lm.h b/arch/arm/mach-integrator/include/mach/lm.h
deleted file mode 100644 (file)
index 28186b6..0000000
--- a/arch/arm/mach-integrator/include/mach/lm.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-struct lm_device {
-       struct device           dev;
-       struct resource         resource;
-       unsigned int            irq;
-       unsigned int            id;
-};
-
-struct lm_driver {
-       struct device_driver    drv;
-       int                     (*probe)(struct lm_device *);
-       void                    (*remove)(struct lm_device *);
-       int                     (*suspend)(struct lm_device *, pm_message_t);
-       int                     (*resume)(struct lm_device *);
-};
-
-int lm_driver_register(struct lm_driver *drv);
-void lm_driver_unregister(struct lm_driver *drv);
-
-int lm_device_register(struct lm_device *dev);
-
-#define lm_get_drvdata(lm)     dev_get_drvdata(&(lm)->dev)
-#define lm_set_drvdata(lm,d)   dev_set_drvdata(&(lm)->dev, d)

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index fedcd2fab0944c4515f3215be86656913fb09b9f..f4ef41707046a2cbb50bc85fc63e449f44f966d6 100644 (file)
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -51,8 +51,6 @@
 #include <asm/param.h>         /* HZ */
 #include <asm/mach-types.h>
 
-#include <mach/lm.h>
-
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
@@ -61,6 +59,7 @@
 #include "cm.h"
 #include "common.h"
 #include "pci_v3.h"
+#include "lm.h"
 
 /* Base address to the AP system controller */
 void __iomem *ap_syscon_base;

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 0ad5f60598c8c940d4cd77b2e71f06aab90309d3..9af1ed995faabaea39662eff433c1d80103fac42 100644 (file)
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -32,9 +32,6 @@
 #include <mach/platform.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
-
-#include <mach/lm.h>
-
 #include <asm/mach/arch.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>

diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-integrator/lm.c
index f52c7af31eaaac41d31bf1fd7c4cc0d9b9f43572..3f9e9f0431683d66a617ac5356f5bc136267d2ae 100644 (file)
--- a/arch/arm/mach-integrator/lm.c
+++ b/arch/arm/mach-integrator/lm.c
@@ -12,7 +12,7 @@
 #include <linux/device.h>
 #include <linux/slab.h>
 
-#include <mach/lm.h>
+#include "lm.h"
 
 #define to_lm_device(d)        container_of(d, struct lm_device, dev)
 #define to_lm_driver(d)        container_of(d, struct lm_driver, drv)

diff --git a/arch/arm/mach-integrator/lm.h b/arch/arm/mach-integrator/lm.h
new file mode 100644 (file)
index 0000000..28186b6
--- /dev/null
+++ b/arch/arm/mach-integrator/lm.h
@@ -0,0 +1,23 @@
+
+struct lm_device {
+       struct device           dev;
+       struct resource         resource;
+       unsigned int            irq;
+       unsigned int            id;
+};
+
+struct lm_driver {
+       struct device_driver    drv;
+       int                     (*probe)(struct lm_device *);
+       void                    (*remove)(struct lm_device *);
+       int                     (*suspend)(struct lm_device *, pm_message_t);
+       int                     (*resume)(struct lm_device *);
+};
+
+int lm_driver_register(struct lm_driver *drv);
+void lm_driver_unregister(struct lm_driver *drv);
+
+int lm_device_register(struct lm_device *dev);
+
+#define lm_get_drvdata(lm)     dev_get_drvdata(&(lm)->dev)
+#define lm_set_drvdata(lm,d)   dev_set_drvdata(&(lm)->dev, d)