From patchwork Wed Sep 12 15:50:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 10597823 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E4B8C14F9 for ; Wed, 12 Sep 2018 15:51:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3A7A2A5AB for ; Wed, 12 Sep 2018 15:51:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D11682A69B; Wed, 12 Sep 2018 15:51:14 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 4D6392A667 for ; Wed, 12 Sep 2018 15:51:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CBE356E57C; Wed, 12 Sep 2018 15:51:12 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE0D66E57C for ; Wed, 12 Sep 2018 15:51:11 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Sep 2018 08:51:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,365,1531810800"; d="scan'208";a="232299928" Received: from rdvivi-vienna.jf.intel.com ([10.7.196.53]) by orsmga004.jf.intel.com with ESMTP; 12 Sep 2018 08:50:57 -0700 From: Rodrigo Vivi To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm] intel: annotate the intel genx helpers as private Date: Wed, 12 Sep 2018 08:50:54 -0700 Message-Id: <20180912155054.17334-1-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180912104403.o3gerb7w2de7ae7v@intel.com> References: <20180912104403.o3gerb7w2de7ae7v@intel.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Engestrom , Rodrigo Vivi , Lucas De Marchi , Emil Velikov MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Emil Velikov They're used internally and never meant to be part of the API. Add the drm_private notation, which should resolve that. v2: (Rodrigo) Add missing include. v3: (Rodrigo) Keep includes grouped per Eric suggestion. Cc: Eric Engestrom Cc: Lucas De Marchi Cc: Chris Wilson Cc: Rodrigo Vivi Fixes: 4e81d4f9c9b ("intel: add generic functions to check PCI ID") Signed-off-by: Emil Velikov Acked-by: Lucas De Marchi Signed-off-by: Rodrigo Vivi Reviewed-by: Eric Engestrom --- intel/intel_chipset.c | 4 ++-- intel/intel_chipset.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/intel/intel_chipset.c b/intel/intel_chipset.c index d5c33cc5..5aa4a2f2 100644 --- a/intel/intel_chipset.c +++ b/intel/intel_chipset.c @@ -44,7 +44,7 @@ static const struct pci_device { INTEL_SKL_IDS(9), }; -bool intel_is_genx(unsigned int devid, int gen) +drm_private bool intel_is_genx(unsigned int devid, int gen) { const struct pci_device *p, *pend = pciids + sizeof(pciids) / sizeof(pciids[0]); @@ -66,7 +66,7 @@ bool intel_is_genx(unsigned int devid, int gen) return false; } -bool intel_get_genx(unsigned int devid, int *gen) +drm_private bool intel_get_genx(unsigned int devid, int *gen) { const struct pci_device *p, *pend = pciids + sizeof(pciids) / sizeof(pciids[0]); diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h index 9b1e64f1..5db207cc 100644 --- a/intel/intel_chipset.h +++ b/intel/intel_chipset.h @@ -329,9 +329,10 @@ /* New platforms use kernel pci ids */ #include +#include -bool intel_is_genx(unsigned int devid, int gen); -bool intel_get_genx(unsigned int devid, int *gen); +drm_private bool intel_is_genx(unsigned int devid, int gen); +drm_private bool intel_get_genx(unsigned int devid, int *gen); #define IS_GEN9(devid) intel_is_genx(devid, 9) #define IS_GEN10(devid) intel_is_genx(devid, 10)