From patchwork Tue Mar 20 06:24:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 10296515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8CC83600F6 for ; Tue, 20 Mar 2018 06:25:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D23128CC7 for ; Tue, 20 Mar 2018 06:25:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71B4628D2B; Tue, 20 Mar 2018 06:25:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1CD7328CC7 for ; Tue, 20 Mar 2018 06:25:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BE556E0F9; Tue, 20 Mar 2018 06:25:47 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 385FF89E9E for ; Tue, 20 Mar 2018 06:25:40 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Mar 2018 23:25:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,334,1517904000"; d="scan'208";a="27183313" Received: from hgaur-mobl1.amr.corp.intel.com (HELO ldmartin-desk.amr.corp.intel.com) ([10.254.14.46]) by orsmga006.jf.intel.com with ESMTP; 19 Mar 2018 23:25:39 -0700 From: Lucas De Marchi To: intel-gfx@lists.freedesktop.org Date: Mon, 19 Mar 2018 23:24:23 -0700 Message-Id: <20180320062423.9166-8-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180320062423.9166-1-lucas.demarchi@intel.com> References: <20180320062423.9166-1-lucas.demarchi@intel.com> Subject: [Intel-gfx] [PATCH 7/7] drm/i915: rename dpll_info to intel_dpll_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lucas De Marchi MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Now that the struct is moved to the header, let's add the proper prefix. git grep -lz "struct dpll_info" -- drivers/gpu/drm/i915/ | \ xargs -0 sed -i 's/struct dpll_info/struct intel_dpll_info/g' Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/i915/intel_dpll_mgr.c | 16 ++++++++-------- drivers/gpu/drm/i915/intel_dpll_mgr.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c index 436fca8efe8c..3fec3cfdc6af 100644 --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c @@ -1882,7 +1882,7 @@ static void intel_ddi_pll_init(struct drm_device *dev) } struct intel_dpll_mgr { - const struct dpll_info *dpll_info; + const struct intel_dpll_info *dpll_info; struct intel_shared_dpll *(*get_dpll)(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state, @@ -1892,7 +1892,7 @@ struct intel_dpll_mgr { struct intel_dpll_hw_state *hw_state); }; -static const struct dpll_info pch_plls[] = { +static const struct intel_dpll_info pch_plls[] = { { "PCH DPLL A", DPLL_ID_PCH_PLL_A, &ibx_pch_dpll_funcs, 0 }, { "PCH DPLL B", DPLL_ID_PCH_PLL_B, &ibx_pch_dpll_funcs, 0 }, { NULL, -1, NULL, 0 }, @@ -1904,7 +1904,7 @@ static const struct intel_dpll_mgr pch_pll_mgr = { .dump_hw_state = ibx_dump_hw_state, }; -static const struct dpll_info hsw_plls[] = { +static const struct intel_dpll_info hsw_plls[] = { { "WRPLL 1", DPLL_ID_WRPLL1, &hsw_ddi_wrpll_funcs, 0 }, { "WRPLL 2", DPLL_ID_WRPLL2, &hsw_ddi_wrpll_funcs, 0 }, { "SPLL", DPLL_ID_SPLL, &hsw_ddi_spll_funcs, 0 }, @@ -1920,7 +1920,7 @@ static const struct intel_dpll_mgr hsw_pll_mgr = { .dump_hw_state = hsw_dump_hw_state, }; -static const struct dpll_info skl_plls[] = { +static const struct intel_dpll_info skl_plls[] = { { "DPLL 0", DPLL_ID_SKL_DPLL0, &skl_ddi_dpll0_funcs, INTEL_DPLL_ALWAYS_ON }, { "DPLL 1", DPLL_ID_SKL_DPLL1, &skl_ddi_pll_funcs, 0 }, { "DPLL 2", DPLL_ID_SKL_DPLL2, &skl_ddi_pll_funcs, 0 }, @@ -1934,7 +1934,7 @@ static const struct intel_dpll_mgr skl_pll_mgr = { .dump_hw_state = skl_dump_hw_state, }; -static const struct dpll_info bxt_plls[] = { +static const struct intel_dpll_info bxt_plls[] = { { "PORT PLL A", DPLL_ID_SKL_DPLL0, &bxt_ddi_pll_funcs, 0 }, { "PORT PLL B", DPLL_ID_SKL_DPLL1, &bxt_ddi_pll_funcs, 0 }, { "PORT PLL C", DPLL_ID_SKL_DPLL2, &bxt_ddi_pll_funcs, 0 }, @@ -2368,7 +2368,7 @@ static const struct intel_shared_dpll_funcs cnl_ddi_pll_funcs = { .get_hw_state = cnl_ddi_pll_get_hw_state, }; -static const struct dpll_info cnl_plls[] = { +static const struct intel_dpll_info cnl_plls[] = { { "DPLL 0", DPLL_ID_SKL_DPLL0, &cnl_ddi_pll_funcs, 0 }, { "DPLL 1", DPLL_ID_SKL_DPLL1, &cnl_ddi_pll_funcs, 0 }, { "DPLL 2", DPLL_ID_SKL_DPLL2, &cnl_ddi_pll_funcs, 0 }, @@ -2391,7 +2391,7 @@ void intel_shared_dpll_init(struct drm_device *dev) { struct drm_i915_private *dev_priv = to_i915(dev); const struct intel_dpll_mgr *dpll_mgr = NULL; - const struct dpll_info *dpll_info; + const struct intel_dpll_info *dpll_info; int i; if (IS_CANNONLAKE(dev_priv)) @@ -2415,7 +2415,7 @@ void intel_shared_dpll_init(struct drm_device *dev) for (i = 0; dpll_info[i].id >= 0; i++) { WARN_ON(i != dpll_info[i].id); memcpy(&dev_priv->shared_dplls[i].info, &dpll_info[i], - sizeof(struct dpll_info)); + sizeof(struct intel_dpll_info)); } dev_priv->dpll_mgr = dpll_mgr; diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.h b/drivers/gpu/drm/i915/intel_dpll_mgr.h index 4f21fb9108b5..e7ff45c11242 100644 --- a/drivers/gpu/drm/i915/intel_dpll_mgr.h +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.h @@ -206,9 +206,9 @@ struct intel_shared_dpll_funcs { }; /** - * struct dpll_info - display PLL platform specific info + * struct intel_dpll_info - display PLL platform specific info */ -struct dpll_info { +struct intel_dpll_info { /** * @name: DPLL name; used for logging */ @@ -258,7 +258,7 @@ struct intel_shared_dpll { /** * @info: platform specific info */ - struct dpll_info info; + struct intel_dpll_info info; }; #define SKL_DPLL0 0