drm/edid: Make edid_load() return a void *
authorGeert Uytterhoeven <geert@linux-m68k.org>
Tue, 19 Nov 2013 11:15:05 +0000 (12:15 +0100)
committerDave Airlie <airlied@redhat.com>
Wed, 18 Dec 2013 00:42:13 +0000 (10:42 +1000)
Always use "void *" for arbitrary memory buffers, as this allows to drop
casts in assignments.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_edid_load.c

index 9081172..1b4c7a5 100644 (file)
@@ -141,7 +141,7 @@ static int edid_size(const u8 *edid, int data_size)
        return (edid[0x7e] + 1) * EDID_LENGTH;
 }
 
-static u8 *edid_load(struct drm_connector *connector, const char *name,
+static void *edid_load(struct drm_connector *connector, const char *name,
                        const char *connector_name)
 {
        const struct firmware *fw = NULL;
@@ -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;