From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1681C07E95 for ; Fri, 16 Jul 2021 06:21:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 33C6B613E7 for ; Fri, 16 Jul 2021 06:21:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33C6B613E7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=nouveau-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D40176E90E; Fri, 16 Jul 2021 06:21:10 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF0E56E90E; Fri, 16 Jul 2021 06:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=aSVhkxQ4oZroaS//zkndjisEcrFxS9kKgiUt3PZVNe8=; b=Q4U9970CPbVXAIeJ6cHePLZPfQ GTuuZa0Gg/5LRptQ+TwUQSKqatmLUVS2udxmulOOiu0kz20ecxvg25NURwP89Ay4hFxiE6dy84wCJ 0Dn8I5R4v7ruZOegkbnxejDmjX53UFiQs3Y3tXytEDbXyUFAxT6wKYWq1FwfFVQYxDRSpFx8Rcxit cczj6lvyajlwh+ugYEbuTCBh9uid1zqfkDNGLBiaYfEeN+b3kvr13DorMmUxLgUWOE4HBG3AesDnQ AAPQp13tSkvbm8frYYNpUgSh+CrmOOuRCycpiBM6R25r5hFolqrqyWanUFSAtANufxrEcmerJn/Yy nQblM3uw==; Received: from [2001:4bb8:184:8b7c:6b57:320d:f068:19c6] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1m4HBc-004CyC-Gy; Fri, 16 Jul 2021 06:19:17 +0000 From: Christoph Hellwig To: David Airlie , Daniel Vetter Date: Fri, 16 Jul 2021 08:16:31 +0200 Message-Id: <20210716061634.2446357-5-hch@lst.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210716061634.2446357-1-hch@lst.de> References: <20210716061634.2446357-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Subject: [Nouveau] [PATCH 4/7] vgaarb: cleanup vgaarb.h X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joonas Lahtinen , kvm@vger.kernel.org, amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, "Pan, Xinhui" , Maarten Lankhorst , Maxime Ripard , Alex Williamson , Jani Nikula , Rodrigo Vivi , Alex Deucher , intel-gfx@lists.freedesktop.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Ben Skeggs Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" Merge the different CONFIG_VGA_ARB ifdef blocks, remove superflous externs, and regularize the stubs for !CONFIG_VGA_ARB. Signed-off-by: Christoph Hellwig --- include/linux/vgaarb.h | 90 ++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 48 deletions(-) diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h index fdce9007d57e..05171fc7e26a 100644 --- a/include/linux/vgaarb.h +++ b/include/linux/vgaarb.h @@ -33,6 +33,8 @@ #include