Switch to the generic helper bus_find_device_by_acpi_dev. Cc: Mark Brown <broonie@xxxxxxxxxx> Cc: linux-spi@xxxxxxxxxxxxxxx Signed-off-by: Suzuki K Poulose <suzuki.poulose@xxxxxxx> --- drivers/spi/spi.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index ecdd602..5224ded 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3634,11 +3634,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, void *data) -{ - return ACPI_COMPANION(dev) == data; -} - static struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev) { struct device *dev; @@ -3658,8 +3653,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(&spi_bus_type, NULL, adev, device_match_acpi_dev); return dev ? to_spi_device(dev) : NULL; } -- 2.7.4