From patchwork Fri Jan 31 06:09:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 3567691 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 5668D9F2F5 for ; Mon, 3 Feb 2014 01:33:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B60A5201C0 for ; Mon, 3 Feb 2014 01:32:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CE318201FD for ; Mon, 3 Feb 2014 01:32:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18B2F120D4F; Sun, 2 Feb 2014 17:32:15 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f51.google.com (mail-pb0-f51.google.com [209.85.160.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 937CB450EE for ; Thu, 30 Jan 2014 22:14:22 -0800 (PST) Received: by mail-pb0-f51.google.com with SMTP id un15so4070974pbc.38 for ; Thu, 30 Jan 2014 22:14:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-type:content-transfer-encoding; bh=BGRkmAtr6oCuCVzH3/VAO4vZHPWjXG3HvWVgh3iYoyc=; b=ZKt9/fHxeN4RQmGDRknSTcUozx/ZmEkPm2a+nzjYJReEcrUYQ8E43FPNIUu3wKzkwb 5lD/E7U3uE6BcPKkoREwnCWxDcaL9bbbLKeVSSIVp24AsLBsX770cCx5vt2jdBUKdiau 8D+Ti6AbxVAV7iBEDLRz3oeXffydPf550E9PNHnorCKNyKd9RjMB/v/a0NVhbE+HLOX9 0Mxldqtju2cE2vcW7Hjsjd1Nmms0AQqgVmIFrzBqIP9oc7lqZRsYo60WEBfDYx1kZrDH Aj9zTPgJLnHOG2pvcFvWZjyRZ85DmQZivyZlCr2t3VCEN6MnGoYyv5fZpIoSdBWrhER8 l+Dg== X-Gm-Message-State: ALoCoQnzvbYm0mxMQ4LQb92RcSk+7a3s1qZBkX026+HjrZZnyAXsrkAW2RkCeNhUK8I6bjXMscNt X-Received: by 10.68.191.73 with SMTP id gw9mr18958285pbc.158.1391148862198; Thu, 30 Jan 2014 22:14:22 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id nu10sm23776585pbb.16.2014.01.30.22.14.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Jan 2014 22:14:21 -0800 (PST) From: Sachin Kamat To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/1] drm/exynos: Fix build error in exynos_hdmi.c Date: Fri, 31 Jan 2014 11:39:32 +0530 Message-Id: <1391148572-24130-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 02 Feb 2014 17:31:57 -0800 Cc: jwboyer@fedoraproject.org, patches@linaro.org, sw0312.kim@samsung.com, sachin.kamat@linaro.org, rahul.sharma@samsung.com 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: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.7 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 ‘hdmi_infoframe’ is already defined in include/linux/hdmi.h. Rename the local variable to avoid the following build error: drivers/gpu/drm/exynos/exynos_hdmi.c:382:8: error: ‘hdmi_infoframe’ defined as wrong kind of tag struct hdmi_infoframe { Signed-off-by: Sachin Kamat Reported-by: Josh Boyer --- drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index a0e10ae..0d4407c 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -379,7 +379,7 @@ static const struct hdmiphy_config hdmiphy_v14_configs[] = { }, }; -struct hdmi_infoframe { +struct hdmi_frameinfo { enum HDMI_PACKET_TYPE type; u8 ver; u8 len; @@ -682,7 +682,7 @@ static u8 hdmi_chksum(struct hdmi_context *hdata, } static void hdmi_reg_infoframe(struct hdmi_context *hdata, - struct hdmi_infoframe *infoframe) + struct hdmi_frameinfo *infoframe) { u32 hdr_sum; u8 chksum; @@ -985,7 +985,7 @@ static void hdmi_conf_reset(struct hdmi_context *hdata) static void hdmi_conf_init(struct hdmi_context *hdata) { - struct hdmi_infoframe infoframe; + struct hdmi_frameinfo infoframe; /* disable HPD interrupts from HDMI IP block, use GPIO instead */ hdmi_reg_writemask(hdata, HDMI_INTC_CON, 0, HDMI_INTC_EN_GLOBAL |