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: 23944 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 04C4C206A0 for ; Fri, 31 Jan 2014 06:14:24 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id vb8sf14425410obc.6 for ; Thu, 30 Jan 2014 22:14:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe:content-type:content-transfer-encoding; bh=BGRkmAtr6oCuCVzH3/VAO4vZHPWjXG3HvWVgh3iYoyc=; b=lT5JtIj+z4o1plknbBWeihUOGOK2wn0p9JcPDrIsbh2vLDSJtoVqRJZcrSuIz5V+v8 mt+aAxFgm8D7kln5c2TfG4b52OYipiEb8F9ExcRIGpdW/Y29WZ4srRsNgfRRiyb5Yk1y wt/nlFvN/D5exmdUYW6utb/qtCnfNFfYF1KvZYISJjLdbLjDr0YBUco3DuCvEO3R2zIN p3w/Oa2WLkMHW7aqoWjy/EvRgMPVcS97t9YQM1g8Tn1gWGEDX1/7CXo9kQ+4imrm0PFp psb2n0bPNY7ulbNAN8MphnuNPpKwx8F9K1e9pq6kiF1si6KVn3RjPHkHS4BjqPGlnX3p Xg3w== X-Gm-Message-State: ALoCoQmcLPtk0Q972NTTFu1CNUGhD+EqeWL6dw214CbfnAGQwt+C90/v8udvBT+bnub/0Cf/AsYf X-Received: by 10.182.104.70 with SMTP id gc6mr7059828obb.35.1391148864041; Thu, 30 Jan 2014 22:14:24 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.106 with SMTP id 97ls949335qgm.29.gmail; Thu, 30 Jan 2014 22:14:23 -0800 (PST) X-Received: by 10.58.29.42 with SMTP id g10mr822934veh.28.1391148863924; Thu, 30 Jan 2014 22:14:23 -0800 (PST) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id qt5si3092054vcb.23.2014.01.30.22.14.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Jan 2014 22:14:23 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id id10so2705653vcb.41 for ; Thu, 30 Jan 2014 22:14:23 -0800 (PST) X-Received: by 10.59.6.7 with SMTP id cq7mr15668795ved.14.1391148863847; Thu, 30 Jan 2014 22:14:23 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp72176vcz; Thu, 30 Jan 2014 22:14:23 -0800 (PST) X-Received: by 10.66.27.107 with SMTP id s11mr19144477pag.64.1391148862770; Thu, 30 Jan 2014 22:14:22 -0800 (PST) Received: from mail-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by mx.google.com with ESMTPS id g5si9211813pav.27.2014.01.30.22.14.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Jan 2014 22:14:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.44 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.44; Received: by mail-pb0-f44.google.com with SMTP id rq2so4073975pbb.3 for ; Thu, 30 Jan 2014 22:14:22 -0800 (PST) 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 Cc: inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, airlied@linux.ie, rahul.sharma@samsung.com, jwboyer@fedoraproject.org, sachin.kamat@linaro.org, patches@linaro.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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ‘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 |