ARM: amba: Move definition of struct amba_id to mod_devicetable.h

The general kernel infrastructure for adding module alises during
module post processing expects the affected device type
identification structures in a common header
<linux/mod_devicetable.h>.

This patch simple moves struct amba_id to the common header, and
adds the appropriate include in <linux/amba/bus.h>.

Signed-off-by: Dave Martin <dave.martin@linaro.org>

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index fcbbe71a3cc177b70f3a958344a73aab47f0fb55..724c69c40bb852ab2e6404f22af6cf60bd03a266 100644 (file)
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -16,6 +16,7 @@
 
 #include <linux/clk.h>
 #include <linux/device.h>
+#include <linux/mod_devicetable.h>
 #include <linux/err.h>
 #include <linux/resource.h>
 #include <linux/regulator/consumer.h>
@@ -35,12 +36,6 @@ struct amba_device {
        unsigned int            irq[AMBA_NR_IRQS];
 };
 
-struct amba_id {
-       unsigned int            id;
-       unsigned int            mask;
-       void                    *data;
-};
-
 struct amba_driver {
        struct device_driver    drv;
        int                     (*probe)(struct amba_device *, const struct amba_id *);

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 468819cdde87c987fad9294e53dcc5652c508980..83ac0713ed0aa9a2a0c79b95013c5bfd42137d9c 100644 (file)
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -542,4 +542,22 @@ struct isapnp_device_id {
        kernel_ulong_t driver_data;     /* data private to the driver */
 };
 
+/**
+ * struct amba_id - identifies a device on an AMBA bus
+ * @id: The significant bits if the hardware device ID
+ * @mask: Bitmask specifying which bits of the id field are significant when
+ *     matching.  A driver binds to a device when ((hardware device ID) & mask)
+ *     == id.
+ * @data: Private data used by the driver.
+ */
+struct amba_id {
+       unsigned int            id;
+       unsigned int            mask;
+#ifndef __KERNEL__
+       kernel_ulong_t          data;
+#else
+       void                    *data;
+#endif
+};
+
 #endif /* LINUX_MOD_DEVICETABLE_H */