device property: Add irq_get to fwnode operation

Add irq_get() fwnode operation to implement fwnode_irq_get() through
fwnode operations, moving the code in fwnode_irq_get() to OF and ACPI
frameworks.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 9f7ca34b7a956b225dcdad0ea533ef152c6c28a1..292364c991a8f59b82445029c96afbda54b6467c 100644 (file)
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -1394,6 +1394,19 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
        return 0;
 }
 
+static int acpi_fwnode_irq_get(const struct fwnode_handle *fwnode,
+                              unsigned int index)
+{
+       struct resource res;
+       int ret;
+
+       ret = acpi_irq_get(ACPI_HANDLE_FWNODE(fwnode), index, &res);
+       if (ret)
+               return ret;
+
+       return res.start;
+}
+
 #define DECLARE_ACPI_FWNODE_OPS(ops) \
        const struct fwnode_operations ops = {                          \
                .device_is_available = acpi_fwnode_device_is_available, \
@@ -1418,6 +1431,7 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
                        acpi_graph_get_remote_endpoint,                 \
                .graph_get_port_parent = acpi_fwnode_get_parent,        \
                .graph_parse_endpoint = acpi_fwnode_graph_parse_endpoint, \
+               .irq_get = acpi_fwnode_irq_get,                         \
        };                                                              \
        EXPORT_SYMBOL_GPL(ops)
 

diff --git a/drivers/base/property.c b/drivers/base/property.c
index 83dd22e7cb81f2c437b8ff06b7cad711028b5f3b..3560c4419d11bc3dffd8583eb3514670e58ed888 100644 (file)
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -901,17 +901,7 @@ EXPORT_SYMBOL(fwnode_iomap);
  */
 int fwnode_irq_get(const struct fwnode_handle *fwnode, unsigned int index)
 {
-       struct resource res;
-       int ret;
-
-       if (is_of_node(fwnode))
-               return of_irq_get(to_of_node(fwnode), index);
-
-       ret = acpi_irq_get(ACPI_HANDLE_FWNODE(fwnode), index, &res);
-       if (ret)
-               return ret;
-
-       return res.start;
+       return fwnode_call_int_op(fwnode, irq_get, index);
 }
 EXPORT_SYMBOL(fwnode_irq_get);
 

diff --git a/drivers/of/property.c b/drivers/of/property.c
index ac2aa5221069f9fd4c68a473f9e494647ee874fe..9a50ad25906eda60ada14e393049a1fd6e487fad 100644 (file)
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -1474,6 +1474,12 @@ static void __iomem *of_fwnode_iomap(struct fwnode_handle *fwnode, int index)
 #endif
 }
 
+static int of_fwnode_irq_get(const struct fwnode_handle *fwnode,
+                            unsigned int index)
+{
+       return of_irq_get(to_of_node(fwnode), index);
+}
+
 static int of_fwnode_add_links(struct fwnode_handle *fwnode)
 {
        struct property *p;
@@ -1512,6 +1518,7 @@ const struct fwnode_operations of_fwnode_ops = {
        .graph_get_port_parent = of_fwnode_graph_get_port_parent,
        .graph_parse_endpoint = of_fwnode_graph_parse_endpoint,
        .iomap = of_fwnode_iomap,
+       .irq_get = of_fwnode_irq_get,
        .add_links = of_fwnode_add_links,
 };
 EXPORT_SYMBOL_GPL(of_fwnode_ops);

diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h
index ebbc3bf03f95275c9eed6b8ea522291705f9bf0e..6ab69871b06dc34ee86686c85bfabb27e91c25e9 100644 (file)
--- a/include/linux/fwnode.h
+++ b/include/linux/fwnode.h
@@ -149,6 +149,7 @@ struct fwnode_operations {
        int (*graph_parse_endpoint)(const struct fwnode_handle *fwnode,
                                    struct fwnode_endpoint *endpoint);
        void __iomem *(*iomap)(struct fwnode_handle *fwnode, int index);
+       int (*irq_get)(const struct fwnode_handle *fwnode, unsigned int index);
        int (*add_links)(struct fwnode_handle *fwnode);
 };