Skip to content

Commit 37bf34e

Browse files
keesjnikula
authored andcommitted
drm/i915: Use designated initializers for init/exit table
The kernel builds with -Werror=designated-init, and __designated_init is used by CONFIG_GCC_PLUGIN_RANDSTRUCT for automatically selected (all function pointer) structures. Include the field names in the init/exit table. Avoids warnings like: drivers/gpu/drm/i915/i915_module.c:59:4: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] Cc: Jani Nikula <[email protected]> Cc: Joonas Lahtinen <[email protected]> Cc: Rodrigo Vivi <[email protected]> Cc: David Airlie <[email protected]> Cc: [email protected] Cc: [email protected] Fixes: a04ea6a ("drm/i915: Use a table for i915_init/exit (v2)") Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 90fd219) Signed-off-by: Jani Nikula <[email protected]>
1 parent 397ab98 commit 37bf34e

File tree

1 file changed

+24
-13
lines changed

1 file changed

+24
-13
lines changed

drivers/gpu/drm/i915/i915_module.c

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,30 @@ static const struct {
4747
int (*init)(void);
4848
void (*exit)(void);
4949
} init_funcs[] = {
50-
{ i915_check_nomodeset, NULL },
51-
{ i915_active_module_init, i915_active_module_exit },
52-
{ i915_buddy_module_init, i915_buddy_module_exit },
53-
{ i915_context_module_init, i915_context_module_exit },
54-
{ i915_gem_context_module_init, i915_gem_context_module_exit },
55-
{ i915_objects_module_init, i915_objects_module_exit },
56-
{ i915_request_module_init, i915_request_module_exit },
57-
{ i915_scheduler_module_init, i915_scheduler_module_exit },
58-
{ i915_vma_module_init, i915_vma_module_exit },
59-
{ i915_mock_selftests, NULL },
60-
{ i915_pmu_init, i915_pmu_exit },
61-
{ i915_register_pci_driver, i915_unregister_pci_driver },
62-
{ i915_perf_sysctl_register, i915_perf_sysctl_unregister },
50+
{ .init = i915_check_nomodeset },
51+
{ .init = i915_active_module_init,
52+
.exit = i915_active_module_exit },
53+
{ .init = i915_buddy_module_init,
54+
.exit = i915_buddy_module_exit },
55+
{ .init = i915_context_module_init,
56+
.exit = i915_context_module_exit },
57+
{ .init = i915_gem_context_module_init,
58+
.exit = i915_gem_context_module_exit },
59+
{ .init = i915_objects_module_init,
60+
.exit = i915_objects_module_exit },
61+
{ .init = i915_request_module_init,
62+
.exit = i915_request_module_exit },
63+
{ .init = i915_scheduler_module_init,
64+
.exit = i915_scheduler_module_exit },
65+
{ .init = i915_vma_module_init,
66+
.exit = i915_vma_module_exit },
67+
{ .init = i915_mock_selftests },
68+
{ .init = i915_pmu_init,
69+
.exit = i915_pmu_exit },
70+
{ .init = i915_register_pci_driver,
71+
.exit = i915_unregister_pci_driver },
72+
{ .init = i915_perf_sysctl_register,
73+
.exit = i915_perf_sysctl_unregister },
6374
};
6475
static int init_progress;
6576

0 commit comments

Comments
 (0)