From patchwork Wed Jul 10 11:16:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 2825622 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 41B469F9CF for ; Wed, 10 Jul 2013 11:23:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6118720198 for ; Wed, 10 Jul 2013 11:23:48 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BBBC22018E for ; Wed, 10 Jul 2013 11:23:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C0E12E627E for ; Wed, 10 Jul 2013 04:23:43 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from georges.telenet-ops.be (georges.telenet-ops.be [195.130.137.68]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E0D2E5EB4 for ; Wed, 10 Jul 2013 04:21:43 -0700 (PDT) Received: from ayla.of.borg ([84.193.72.141]) by georges.telenet-ops.be with bizsmtp id ybGi1l00332ts5g06bGiEJ; Wed, 10 Jul 2013 13:16:42 +0200 Received: from geert by ayla.of.borg with local (Exim 4.76) (envelope-from ) id 1UwsO1-0005ek-SZ; Wed, 10 Jul 2013 13:16:41 +0200 From: Geert Uytterhoeven To: David Airlie Subject: [PATCH 3/3] drm/edid: Make edid_load() return a void * Date: Wed, 10 Jul 2013 13:16:36 +0200 Message-Id: <1373454996-21706-3-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1373454996-21706-1-git-send-email-geert@linux-m68k.org> References: <1373454996-21706-1-git-send-email-geert@linux-m68k.org> Cc: Geert Uytterhoeven , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Always use "void *" for arbitrary memory buffers, as this allows to drop casts in assignments. Signed-off-by: Geert Uytterhoeven --- drivers/gpu/drm/drm_edid_load.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index 9be3467..d1daf34 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c @@ -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;