diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 17:21:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 17:21:46 -0400 |
| commit | 496fd15bee6f2fd673ab992e5211c5f3c5bd6779 (patch) | |
| tree | 27ac5d1e7de340c37223e8b35e44d5c3583f8ef0 | |
| parent | bfffbea1aaeeb1eb6500c83ff9653416daa5b490 (diff) | |
drm: avoid warning in drm_load_edid_firmware()
Use "const char *" instead of "char *" in order to avoid this warning:
drivers/gpu/drm/drm_edid_load.c: In function ‘drm_load_edid_firmware’:
drivers/gpu/drm/drm_edid_load.c:245:25: warning: initialization discards ‘const’ qualifier from pointer target type [enabled by default]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/gpu/drm/drm_edid_load.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index a4f5ce14dc1c..271b42bbfb72 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c | |||
| @@ -133,8 +133,8 @@ static u8 generic_edid[GENERIC_EDIDS][128] = { | |||
| 133 | }, | 133 | }, |
| 134 | }; | 134 | }; |
| 135 | 135 | ||
| 136 | static u8 *edid_load(struct drm_connector *connector, char *name, | 136 | static u8 *edid_load(struct drm_connector *connector, const char *name, |
| 137 | char *connector_name) | 137 | const char *connector_name) |
| 138 | { | 138 | { |
| 139 | const struct firmware *fw; | 139 | const struct firmware *fw; |
| 140 | struct platform_device *pdev; | 140 | struct platform_device *pdev; |
| @@ -242,7 +242,7 @@ out: | |||
| 242 | 242 | ||
| 243 | int drm_load_edid_firmware(struct drm_connector *connector) | 243 | int drm_load_edid_firmware(struct drm_connector *connector) |
| 244 | { | 244 | { |
| 245 | char *connector_name = drm_get_connector_name(connector); | 245 | const char *connector_name = drm_get_connector_name(connector); |
| 246 | char *edidname = edid_firmware, *last, *colon; | 246 | char *edidname = edid_firmware, *last, *colon; |
| 247 | int ret; | 247 | int ret; |
| 248 | struct edid *edid; | 248 | struct edid *edid; |
