Skip to contentSkip to conversation

ACPI / bus: Remove checks in acpi_get_match_data()

PATCH New Andy Shevchenko 1 participant 1 message Jan 31, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 ACPI / bus: Remove checks in acpi_get_match_data()

As well as its sibling of_device_get_match_data() has no such checks, no need to do it in acpi_get_match_data().

First of all, we are not supposed to call fwnode API like this without driver attached.

Second, if pure OF driver calls this function, it's weird to have ACPI companion without ACPI ID in this case.

Fixes 80212a162329 ("ACPI / bus: Introduce acpi_get_match_data() function")
Cc Sinan Kaya <[email protected]>
Cc Sakari Ailus <[email protected]>
Cc Vinod Koul <[email protected]>
---
 drivers/acpi/bus.c | 6 ------
 1 file changed, 6 deletions(-)
drivers/acpi/bus.c +0 -6
index f87ed3be779a..b271eb16341d 100644
@@ -789,12 +789,6 @@ void *acpi_get_match_data(const struct device *dev)
 {
 	const struct acpi_device_id *match;
 
-	if (!dev->driver)
-		return NULL;
-
-	if (!dev->driver->acpi_match_table)
-		return NULL;
-
 	match = acpi_match_device(dev->driver->acpi_match_table, dev);
 	if (!match)
 		return NULL;