Skip to contentSkip to conversation

drm/edid: Fix constness warning in drm_load_edid_firmware()

PATCH In review Geert Uytterhoeven 2 participants 4 messages Jul 10, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 drm/edid: Fix constness warning in drm_load_edid_firmware()

drivers/gpu/drm/drm_edid_load.c: In function ‘drm_load_edid_firmware’:
drivers/gpu/drm/drm_edid_load.c:245: warning: initialization discards qualifiers from pointer target type

drm_get_connector_name() returns a "const char *", hence propagate the const where needed.

---
 drivers/gpu/drm/drm_edid_load.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_edid_load.c +2 -2
index a4f5ce1..2c2803f 100644
@@ -134,7 +134,7 @@ static u8 generic_edid[GENERIC_EDIDS][128] = {
 };
 
 static u8 *edid_load(struct drm_connector *connector, char *name,
-			char *connector_name)
+			const char *connector_name)
 {
 	const struct firmware *fw;
 	struct platform_device *pdev;
@@ -242,7 +242,7 @@ out:
 
 int drm_load_edid_firmware(struct drm_connector *connector)
 {
-	char *connector_name = drm_get_connector_name(connector);
+	const char *connector_name = drm_get_connector_name(connector);
 	char *edidname = edid_firmware, *last, *colon;
 	int ret;
 	struct edid *edid;
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 2/3 drm/edid: Fix uninitialized return variable in edid_load()

drivers/gpu/drm/drm_edid_load.c: In function ‘edid_load’:
drivers/gpu/drm/drm_edid_load.c:141: warning: ‘edid’ may be used uninitialized in this function

In some error cases, edid_load() will return the uninitialized variable. Initialize it to NULL to fix this.

---
 drivers/gpu/drm/drm_edid_load.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_edid_load.c +1 -1
index 2c2803f..9be3467 100644
@@ -138,7 +138,7 @@ static u8 *edid_load(struct drm_connector *connector, char *name,
 {
 	const struct firmware *fw;
 	struct platform_device *pdev;
-	u8 *fwdata = NULL, *edid, *new_edid;
+	u8 *fwdata = NULL, *edid = NULL, *new_edid;
 	int fwsize, expected;
 	int builtin = 0, err = 0;
 	int i, valid_extensions = 0;
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 3/3 drm/edid: Make edid_load() return a void *

In reply to Geert Uytterhoeven

Always use "void *" for arbitrary memory buffers, as this allows to drop casts in assignments.

---
 drivers/gpu/drm/drm_edid_load.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_edid_load.c +2 -2
index 9be3467..d1daf34 100644
@@ -133,7 +133,7 @@ static u8 generic_edid[GENERIC_EDIDS][128] = {
 	},
 };
 
-static u8 *edid_load(struct drm_connector *connector, char *name,
+static void *edid_load(struct drm_connector *connector, char *name,
 			const char *connector_name)
 {
 	const struct firmware *fw;
@@ -263,7 +263,7 @@ int drm_load_edid_firmware(struct drm_connector *connector)
 	if (*last == '\n')
 		*last = '\0';
 
-	edid = (struct edid *) edid_load(connector, edidname, connector_name);
+	edid = edid_load(connector, edidname, connector_name);
 	if (IS_ERR_OR_NULL(edid))
 		return 0;
 
Signature · 1 line
1.7.9.5
Reviewed-by on v1 1/3
#3 lore raw
In reply to Geert Uytterhoeven
Quoted 7 lines · Geert Uytterhoeven

drivers/gpu/drm/drm_edid_load.c: In function ‘drm_load_edid_firmware’:
drivers/gpu/drm/drm_edid_load.c:245: warning: initialization discards qualifiers from pointer target type

drm_get_connector_name() returns a "const char *", hence propagate the const where needed.

For the series:

Quoted 33 lines
---
 drivers/gpu/drm/drm_edid_load.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_edid_load.c +2 -3
index a4f5ce1..2c2803f 100644
@@ -134,7 +134,7 @@ static u8 generic_edid[GENERIC_EDIDS][128] = {
 };
 
 static u8 *edid_load(struct drm_connector *connector, char *name,
-                       char *connector_name)
+                       const char *connector_name)
 {
        const struct firmware *fw;
        struct platform_device *pdev;
@@ -242,7 +242,7 @@ out:
 
 int drm_load_edid_firmware(struct drm_connector *connector)
 {
-       char *connector_name = drm_get_connector_name(connector);
+       const char *connector_name = drm_get_connector_name(connector);
        char *edidname = edid_firmware, *last, *colon;
        int ret;
        struct edid *edid;
--

1.7.9.5

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel