drivers/acpi: Remove function cast

Remove the function cast in the ACPI_DECLARE_PROBE_ENTRY macro to ensure
that the functions passed as a last parameter to this macro have the
right prototype.

This is an effort to enable -Wcast-function-type in the top-level Makefile
to support Control Flow Integrity builds.

Suggested-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Oscar Carter <oscar.carter@gmx.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/20200530143430.5203-4-oscar.carter@gmx.com

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index cf74e044a570b3b273bf5f810eed4697f38d7f1e..1cda2d32e4c49a0d4854ebc83a2f6d15070bf27e 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -1143,16 +1143,16 @@ struct acpi_probe_entry {
        kernel_ulong_t driver_data;
 };
 
-#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, valid, data, fn)     \
+#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable,      \
+                                valid, data, fn)                       \
        static const struct acpi_probe_entry __acpi_probe_##name        \
-               __used __section(__##table##_acpi_probe_table)          \
-                = {                                                    \
+               __used __section(__##table##_acpi_probe_table) = {      \
                        .id = table_id,                                 \
                        .type = subtable,                               \
                        .subtable_valid = valid,                        \
-                       .probe_table = (acpi_tbl_table_handler)fn,      \
-                       .driver_data = data,                            \
-                  }
+                       .probe_table = fn,                              \
+                       .driver_data = data,                            \
+               }
 
 #define ACPI_DECLARE_SUBTABLE_PROBE_ENTRY(table, name, table_id,       \
                                          subtable, valid, data, fn)    \