From patchwork Thu Jan 30 21:19:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 3559241 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 183A4C02DC for ; Thu, 30 Jan 2014 21:20:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 397CC20181 for ; Thu, 30 Jan 2014 21:20:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4720120173 for ; Thu, 30 Jan 2014 21:20:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A2354444E; Thu, 30 Jan 2014 13:19:58 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f172.google.com (mail-qc0-f172.google.com [209.85.216.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 2191144189 for ; Thu, 30 Jan 2014 13:19:56 -0800 (PST) Received: by mail-qc0-f172.google.com with SMTP id c9so5950274qcz.31 for ; Thu, 30 Jan 2014 13:19:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6wb25z9AtlzZFSCc0YISjNL2n42Z4ZnuT7DEBiYSClo=; b=bwcaQSaAxOHODg/6YbfHvT9K87siQgQKId/Brdom7ctCBhTqH9ep1BWU0rc3MAHKud mk+ZoAzr9h7pbZaV2W6C3HDXRpMvg+LIXMe2swwNyRBCjD6cL3K2/9tHBy9Hv531PonA 4RCyLJi06GJtuAPSqvjZjlOwV/LF8gIfm3c6M= 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:in-reply-to :references; bh=6wb25z9AtlzZFSCc0YISjNL2n42Z4ZnuT7DEBiYSClo=; b=JcTFyxykKyyB4tGHEpx5DXDZbvicEha4lpNkv5OPqCzCpIPemd93/SWscHexfvW/0X y6s3kKg9mCQT3nLYUYblipgEP9MUSOc64ZxB9mkj6M+i780MbUF0KzrBu2X9vpo58wwh xulcGdV34vAOnkNXypMnM6lafz+Uo7UDYcmxq/ZkGOhM+bqM0bofVu+Mk9wpHMio6Gu2 VCMeGzGQT2mvAyHRaAPLfTEznteJOL11c+Z8H54mMJdCQ/F9u0JJeKrQm//dl7ngp1y+ zbLUWIm/2QFUe7Wn0YRjSTL+ac5gn8DaVjgDdPnR9Lmv25tNk4dBkqgp61G9YMc5dUWz vREA== X-Gm-Message-State: ALoCoQlZu5S+CHhP76o0CoqrUM7hgUKapnpRwIJPhb9uU1BBTwQlAmYpwW7V3jmWlUVzueKbf7K+ X-Received: by 10.140.92.54 with SMTP id a51mr24601429qge.111.1391116794576; Thu, 30 Jan 2014 13:19:54 -0800 (PST) Received: from seanpaul-glaptop.roam.corp.google.com (cpe-173-095-180-236.nc.res.rr.com. [173.95.180.236]) by mx.google.com with ESMTPSA id r13sm20673608qan.7.2014.01.30.13.19.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Jan 2014 13:19:54 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, inki.dae@samsung.com Subject: [PATCH v4 01/34] drm/exynos: Rename hdmi_infoframe to avoid collision Date: Thu, 30 Jan 2014 16:19:00 -0500 Message-Id: <1391116773-28471-2-git-send-email-seanpaul@chromium.org> X-Mailer: git-send-email 1.8.5.1 In-Reply-To: <1391116773-28471-1-git-send-email-seanpaul@chromium.org> References: <1391116773-28471-1-git-send-email-seanpaul@chromium.org> Cc: marcheu@chromium.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@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Rename hdmi_infoframe to exynos_hdmi_infoframe to avoid nameing collision. Signed-off-by: Sean Paul --- Changes in v4: - Added 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..e1c1bfc 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 exynos_hdmi_infoframe { 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 exynos_hdmi_infoframe *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 exynos_hdmi_infoframe infoframe; /* disable HPD interrupts from HDMI IP block, use GPIO instead */ hdmi_reg_writemask(hdata, HDMI_INTC_CON, 0, HDMI_INTC_EN_GLOBAL |