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: a04ea6ae7c67 ("drm/i915: Use a table for i915_init/exit (v2)")
Signed-off-by: Kees Cook <[email protected]>
---
drivers/gpu/drm/i915/i915_module.c | 37 +++++++++++++++++++-----------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_module.c b/drivers/gpu/drm/i915/i915_module.c
index c578ea8f56a0..d8b4482c69d0 100644
--- a/drivers/gpu/drm/i915/i915_module.c
+++ b/drivers/gpu/drm/i915/i915_module.c
@@ -47,19 +47,30 @@ static const struct {
int (*init)(void);
void (*exit)(void);
} init_funcs[] = {
- { i915_check_nomodeset, NULL },
- { i915_active_module_init, i915_active_module_exit },
- { i915_buddy_module_init, i915_buddy_module_exit },
- { i915_context_module_init, i915_context_module_exit },
- { i915_gem_context_module_init, i915_gem_context_module_exit },
- { i915_objects_module_init, i915_objects_module_exit },
- { i915_request_module_init, i915_request_module_exit },
- { i915_scheduler_module_init, i915_scheduler_module_exit },
- { i915_vma_module_init, i915_vma_module_exit },
- { i915_mock_selftests, NULL },
- { i915_pmu_init, i915_pmu_exit },
- { i915_register_pci_driver, i915_unregister_pci_driver },
- { i915_perf_sysctl_register, i915_perf_sysctl_unregister },
+ { .init = i915_check_nomodeset },
+ { .init = i915_active_module_init,
+ .exit = i915_active_module_exit },
+ { .init = i915_buddy_module_init,
+ .exit = i915_buddy_module_exit },
+ { .init = i915_context_module_init,
+ .exit = i915_context_module_exit },
+ { .init = i915_gem_context_module_init,
+ .exit = i915_gem_context_module_exit },
+ { .init = i915_objects_module_init,
+ .exit = i915_objects_module_exit },
+ { .init = i915_request_module_init,
+ .exit = i915_request_module_exit },
+ { .init = i915_scheduler_module_init,
+ .exit = i915_scheduler_module_exit },
+ { .init = i915_vma_module_init,
+ .exit = i915_vma_module_exit },
+ { .init = i915_mock_selftests },
+ { .init = i915_pmu_init,
+ .exit = i915_pmu_exit },
+ { .init = i915_register_pci_driver,
+ .exit = i915_unregister_pci_driver },
+ { .init = i915_perf_sysctl_register,
+ .exit = i915_perf_sysctl_unregister },
};
static int init_progress;
--
2.30.2
On Tue, Aug 17, 2021 at 04:33:57PM -0700, Kees Cook wrote:
> 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: a04ea6ae7c67 ("drm/i915: Use a table for i915_init/exit (v2)")
> Signed-off-by: Kees Cook <[email protected]>
Applied to drm-intel-gt-next, should show up in linux-next/next merge
window eventually (that branch isn't in linux-next for reasons).
-Daniel
> ---
> drivers/gpu/drm/i915/i915_module.c | 37 +++++++++++++++++++-----------
> 1 file changed, 24 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_module.c b/drivers/gpu/drm/i915/i915_module.c
> index c578ea8f56a0..d8b4482c69d0 100644
> --- a/drivers/gpu/drm/i915/i915_module.c
> +++ b/drivers/gpu/drm/i915/i915_module.c
> @@ -47,19 +47,30 @@ static const struct {
> int (*init)(void);
> void (*exit)(void);
> } init_funcs[] = {
> - { i915_check_nomodeset, NULL },
> - { i915_active_module_init, i915_active_module_exit },
> - { i915_buddy_module_init, i915_buddy_module_exit },
> - { i915_context_module_init, i915_context_module_exit },
> - { i915_gem_context_module_init, i915_gem_context_module_exit },
> - { i915_objects_module_init, i915_objects_module_exit },
> - { i915_request_module_init, i915_request_module_exit },
> - { i915_scheduler_module_init, i915_scheduler_module_exit },
> - { i915_vma_module_init, i915_vma_module_exit },
> - { i915_mock_selftests, NULL },
> - { i915_pmu_init, i915_pmu_exit },
> - { i915_register_pci_driver, i915_unregister_pci_driver },
> - { i915_perf_sysctl_register, i915_perf_sysctl_unregister },
> + { .init = i915_check_nomodeset },
> + { .init = i915_active_module_init,
> + .exit = i915_active_module_exit },
> + { .init = i915_buddy_module_init,
> + .exit = i915_buddy_module_exit },
> + { .init = i915_context_module_init,
> + .exit = i915_context_module_exit },
> + { .init = i915_gem_context_module_init,
> + .exit = i915_gem_context_module_exit },
> + { .init = i915_objects_module_init,
> + .exit = i915_objects_module_exit },
> + { .init = i915_request_module_init,
> + .exit = i915_request_module_exit },
> + { .init = i915_scheduler_module_init,
> + .exit = i915_scheduler_module_exit },
> + { .init = i915_vma_module_init,
> + .exit = i915_vma_module_exit },
> + { .init = i915_mock_selftests },
> + { .init = i915_pmu_init,
> + .exit = i915_pmu_exit },
> + { .init = i915_register_pci_driver,
> + .exit = i915_unregister_pci_driver },
> + { .init = i915_perf_sysctl_register,
> + .exit = i915_perf_sysctl_unregister },
> };
> static int init_progress;
>
> --
> 2.30.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch