Commit ce456e03 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Dave Airlie

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

Always use "void *" for arbitrary memory buffers, as this allows to drop
casts in assignments.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent da32cc90
...@@ -141,7 +141,7 @@ static int edid_size(const u8 *edid, int data_size) ...@@ -141,7 +141,7 @@ static int edid_size(const u8 *edid, int data_size)
return (edid[0x7e] + 1) * EDID_LENGTH; 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 char *connector_name)
{ {
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
...@@ -263,7 +263,7 @@ int drm_load_edid_firmware(struct drm_connector *connector) ...@@ -263,7 +263,7 @@ int drm_load_edid_firmware(struct drm_connector *connector)
if (*last == '\n') if (*last == '\n')
*last = '\0'; *last = '\0';
edid = (struct edid *) edid_load(connector, edidname, connector_name); edid = edid_load(connector, edidname, connector_name);
if (IS_ERR_OR_NULL(edid)) if (IS_ERR_OR_NULL(edid))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment