With device ID info now including pointers instead of indices, the open-coded ACPI/OF matching is no longer needed and can be replaced with `device_get_match_data`. With the removal of open-coded matching, the exposed functions and helpers are also removed; this effectively reverts most of commit 2690d071584e ("rust: ACPI: fix missing match data for PRP0001").
Showing the changes to include (1 of 9 files). Show all
Unified · Split
| @@ -189,10 +189,6 @@ struct acpi_driver { · 188 unmodified lines | |||
| 189 | * ----------- | 189 | * ----------- |
| 190 | */ | 190 | */ |
| 191 | 191 | ||
| 192 | bool acpi_of_match_device(const struct acpi_device *adev, | ||
| 193 | const struct of_device_id *of_match_table, | ||
| 194 | const struct of_device_id **of_id); | ||
| 195 | |||
| 196 | /* Status (_STA) */ | 192 | /* Status (_STA) */ |
| 197 | 193 | ||
| 198 | struct acpi_device_status { | 194 | struct acpi_device_status { |
| @@ -1000,13 +996,6 @@ int acpi_scan_add_dep(acpi_handle handle, struct acpi_handle_list *dep_devices); · 801 unmodified lines | |||
| 1000 | u32 arch_acpi_add_auto_dep(acpi_handle handle); | 996 | u32 arch_acpi_add_auto_dep(acpi_handle handle); |
| 1001 | #else /* CONFIG_ACPI */ | 997 | #else /* CONFIG_ACPI */ |
| 1002 | 998 | ||
| 1003 | static inline bool acpi_of_match_device(const struct acpi_device *adev, | ||
| 1004 | const struct of_device_id *of_match_table, | ||
| 1005 | const struct of_device_id **of_id) | ||
| 1006 | { | ||
| 1007 | return false; | ||
| 1008 | } | ||
| 1009 | |||
| 1010 | static inline int register_acpi_bus_type(void *bus) { return 0; } | 999 | static inline int register_acpi_bus_type(void *bus) { return 0; } |
| 1011 | static inline int unregister_acpi_bus_type(void *bus) { return 0; } | 1000 | static inline int unregister_acpi_bus_type(void *bus) { return 0; } |
| 1012 | 1001 | ||