[PATCH 08/11] drm: constify sysrq_key_op

Daniel Vetter daniel at ffwll.ch
Thu May 14 12:36:54 UTC 2020


On Wed, May 13, 2020 at 10:43:48PM +0100, Emil Velikov wrote:
> With earlier commits, the API no longer discards the const-ness of the
> sysrq_key_op. As such we can add the notation.
> 
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Jiri Slaby <jslaby at suse.com>
> Cc: linux-kernel at vger.kernel.org
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Maxime Ripard <mripard at kernel.org>
> Cc: Thomas Zimmermann <tzimmermann at suse.de>
> Cc: dri-devel at lists.freedesktop.org
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
> Please keep me in the CC list, as I'm not subscribed to the list.
> 
> IMHO it would be better if this gets merged this via the tty tree.

Shouldn't conflict, looks all reasonable for merging through tty as one
series.

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/drm_fb_helper.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index a9771de4d17e..533767100efe 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -307,13 +307,13 @@ static void drm_fb_helper_sysrq(int dummy1)
>  	schedule_work(&drm_fb_helper_restore_work);
>  }
>  
> -static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = {
> +static const struct sysrq_key_op sysrq_drm_fb_helper_restore_op = {
>  	.handler = drm_fb_helper_sysrq,
>  	.help_msg = "force-fb(V)",
>  	.action_msg = "Restore framebuffer console",
>  };
>  #else
> -static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { };
> +static const struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { };
>  #endif
>  
>  static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode)
> -- 
> 2.25.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list