| From 250363a413cd08e723789e1b8821608ff5eebfe6 Mon Sep 17 00:00:00 2001 |
| From: Hans de Goede <hdegoede@redhat.com> |
| Date: Mon, 18 Nov 2019 16:51:23 +0100 |
| Subject: [PATCH] drm/modes: parse_cmdline: Make various char pointers |
| const |
| |
| Commit 83e14ea3a64f00897cc31974d3ae4e27e5a7405b upstream. |
| |
| We are not supposed to modify the passed in string, make char pointers |
| used in drm_mode_parse_cmdline_options() const char * where possible. |
| |
| Acked-by: Maxime Ripard <mripard@kernel.org> |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-2-hdegoede@redhat.com |
| --- |
| drivers/gpu/drm/drm_modes.c | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/gpu/drm/drm_modes.c |
| +++ b/drivers/gpu/drm/drm_modes.c |
| @@ -1591,15 +1591,15 @@ static int drm_mode_parse_cmdline_int(co |
| return 0; |
| } |
| |
| -static int drm_mode_parse_cmdline_options(char *str, size_t len, |
| +static int drm_mode_parse_cmdline_options(const char *str, size_t len, |
| const struct drm_connector *connector, |
| struct drm_cmdline_mode *mode) |
| { |
| unsigned int deg, margin, rotation = 0; |
| - char *sep = str; |
| + const char *sep = str; |
| |
| while ((sep = strchr(sep, ','))) { |
| - char *delim, *option; |
| + const char *delim, *option; |
| |
| option = sep + 1; |
| delim = strchr(option, '='); |
| @@ -1725,8 +1725,8 @@ bool drm_mode_parse_command_line_for_con |
| bool named_mode = false, parse_extras = false; |
| unsigned int bpp_off = 0, refresh_off = 0, options_off = 0; |
| unsigned int mode_end = 0; |
| - char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL; |
| - char *options_ptr = NULL; |
| + const char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL; |
| + const char *options_ptr = NULL; |
| char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL; |
| int ret; |
| |