Subject: + drivers-gpu-drm-drm_edid_loadc-make-edid_load-return-a-void.patch added to -mm tree To: geert@xxxxxxxxxxxxxx,alexander.deucher@xxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 19 Nov 2013 14:33:26 -0800 The patch titled Subject: drivers/gpu/drm/drm_edid_load.c: make edid_load() return a void * has been added to the -mm tree. Its filename is drivers-gpu-drm-drm_edid_loadc-make-edid_load-return-a-void.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/drivers-gpu-drm-drm_edid_loadc-make-edid_load-return-a-void.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/drivers-gpu-drm-drm_edid_loadc-make-edid_load-return-a-void.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Subject: drivers/gpu/drm/drm_edid_load.c: make edid_load() return a void * Always use "void *" for arbitrary memory buffers, as this allows to drop casts in assignments. Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/drm_edid_load.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/gpu/drm/drm_edid_load.c~drivers-gpu-drm-drm_edid_loadc-make-edid_load-return-a-void drivers/gpu/drm/drm_edid_load.c --- a/drivers/gpu/drm/drm_edid_load.c~drivers-gpu-drm-drm_edid_loadc-make-edid_load-return-a-void +++ a/drivers/gpu/drm/drm_edid_load.c @@ -141,7 +141,7 @@ static int edid_size(const u8 *edid, int 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_co 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; _ Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are origin.patch drivers-rtc-rtc-s5mc-fix-info-rtc-assignment.patch drivers-gpu-drm-drm_edid_loadc-make-edid_load-return-a-void.patch genirq-correct-fuzzy-and-fragile-irq_retval-definition.patch scsi-do-not-call-do_div-with-a-64-bit-divisor.patch asm-typesh-remove-include-asm-generic-int-l64h.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html