Merge tag 'leds-for-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anasz...

[linux-2.6-block.git] / drivers / spi / spi.c

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index f8b4654a57d3950f9678e0b3df0de8ddbfe4bee5..f9502dbbb5c1e5a590289bf2818205f508d5b105 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -3655,37 +3655,25 @@ EXPORT_SYMBOL_GPL(spi_write_then_read);
 /*-------------------------------------------------------------------------*/
 
 #if IS_ENABLED(CONFIG_OF)
-static int __spi_of_device_match(struct device *dev, const void *data)
-{
-       return dev->of_node == data;
-}
-
 /* must call put_device() when done with returned spi_device device */
 struct spi_device *of_find_spi_device_by_node(struct device_node *node)
 {
-       struct device *dev = bus_find_device(&spi_bus_type, NULL, node,
-                                               __spi_of_device_match);
+       struct device *dev = bus_find_device_by_of_node(&spi_bus_type, node);
+
        return dev ? to_spi_device(dev) : NULL;
 }
 EXPORT_SYMBOL_GPL(of_find_spi_device_by_node);
 #endif /* IS_ENABLED(CONFIG_OF) */
 
 #if IS_ENABLED(CONFIG_OF_DYNAMIC)
-static int __spi_of_controller_match(struct device *dev, const void *data)
-{
-       return dev->of_node == data;
-}
-
 /* the spi controllers are not using spi_bus, so we find it with another way */
 static struct spi_controller *of_find_spi_controller_by_node(struct device_node *node)
 {
        struct device *dev;
 
-       dev = class_find_device(&spi_master_class, NULL, node,
-                               __spi_of_controller_match);
+       dev = class_find_device_by_of_node(&spi_master_class, node);
        if (!dev && IS_ENABLED(CONFIG_SPI_SLAVE))
-               dev = class_find_device(&spi_slave_class, NULL, node,
-                                       __spi_of_controller_match);
+               dev = class_find_device_by_of_node(&spi_slave_class, node);
        if (!dev)
                return NULL;
 
@@ -3756,11 +3744,6 @@ static int spi_acpi_controller_match(struct device *dev, const void *data)
        return ACPI_COMPANION(dev->parent) == data;
 }
 
-static int spi_acpi_device_match(struct device *dev, const void *data)
-{
-       return ACPI_COMPANION(dev) == data;
-}
-
 static struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev)
 {
        struct device *dev;
@@ -3780,8 +3763,7 @@ static struct spi_device *acpi_spi_find_device_by_adev(struct acpi_device *adev)
 {
        struct device *dev;
 
-       dev = bus_find_device(&spi_bus_type, NULL, adev, spi_acpi_device_match);
-
+       dev = bus_find_device_by_acpi_dev(&spi_bus_type, adev);
        return dev ? to_spi_device(dev) : NULL;
 }