aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-04-08 19:50:44 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-04-08 19:50:44 +0200
commit87ad236001eb95cf1760ccaf7670c94722231097 (patch)
treee746f9a1b7366fbc4945399724fbc28a0b76d342 /drivers/spi/spi.c
parentRevert "ACPI: processor: idle: Only flush cache on entering C3" (diff)
parentACPI: bus: Eliminate acpi_bus_get_device() (diff)
downloadlinux-dev-87ad236001eb95cf1760ccaf7670c94722231097.tar.xz
linux-dev-87ad236001eb95cf1760ccaf7670c94722231097.zip
Merge branch 'acpi-bus'
* acpi-bus: ACPI: bus: Eliminate acpi_bus_get_device()
Diffstat (limited to 'drivers/spi/spi.c')
-rw-r--r--drivers/spi/spi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index c4dd1200fe99..9bb5400af205 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -2406,7 +2406,8 @@ static int acpi_spi_add_resource(struct acpi_resource *ares, void *data)
} else {
struct acpi_device *adev;
- if (acpi_bus_get_device(parent_handle, &adev))
+ adev = acpi_fetch_acpi_dev(parent_handle);
+ if (!adev)
return -ENODEV;
ctlr = acpi_spi_find_controller_by_adev(adev);