ACPI: property: Move acpi_fwnode_device_get_match_data() up
authorSakari Ailus <sakari.ailus@linux.intel.com>
Thu, 31 Mar 2022 12:54:48 +0000 (15:54 +0300)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 5 Apr 2022 13:30:47 +0000 (15:30 +0200)
Move acpi_fwnode_device_get_match_data() up below
acpi_fwnode_device_is_available() so the order matches that in struct
fwnode_operations.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
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>
drivers/acpi/property.c

index 24983c379aba41f4c379de050dece5b71b06f170..9f7ca34b7a956b225dcdad0ea533ef152c6c28a1 100644 (file)
@@ -1256,6 +1256,13 @@ static bool acpi_fwnode_device_is_available(const struct fwnode_handle *fwnode)
        return acpi_device_is_present(to_acpi_device_node(fwnode));
 }
 
+static const void *
+acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode,
+                                 const struct device *dev)
+{
+       return acpi_device_get_match_data(dev);
+}
+
 static bool acpi_fwnode_device_dma_supported(const struct fwnode_handle *fwnode)
 {
        return acpi_dma_supported(to_acpi_device_node(fwnode));
@@ -1387,13 +1394,6 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
        return 0;
 }
 
-static const void *
-acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode,
-                                 const struct device *dev)
-{
-       return acpi_device_get_match_data(dev);
-}
-
 #define DECLARE_ACPI_FWNODE_OPS(ops) \
        const struct fwnode_operations ops = {                          \
                .device_is_available = acpi_fwnode_device_is_available, \