Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp765142ybj; Thu, 7 May 2020 07:10:58 -0700 (PDT) X-Google-Smtp-Source: APiQypKGujWGPsBTwZ8VYP7wcG97fdtQOao3xfZQiM8NGlxuJa7SwRrS4c0gHbJvKIJkip2HvN9x X-Received: by 2002:a05:6402:b15:: with SMTP id bm21mr12093201edb.307.1588860658775; Thu, 07 May 2020 07:10:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588860658; cv=none; d=google.com; s=arc-20160816; b=y6dd6aAiovsfw/KzrKB8DTFqoa7asF93IbdQEFy4n/VhYGCwpSKrzMWB4QG5tt67kq nERGbPRVMzJLXgm704Cr9OWNf3cTXtAWvGew6M8FjQaDbekVhCgJSB1PdXKunsRVBSVe VHyrfAS2xMXhOylJDtRtrYeon8pQ2Zx3e3mrHUBJnpKOgjrPZIrw1Nj6o2lL/bWzzt/c vCT832Ept138uVMGousctSJyF/qodZvQVBBIHa0zz50Jfpqf1muMKToGjV/yN5JnSTWC P4i/h7M4nUjfoA67rCJR24y4UcE3HC3GjFUAPALvFhC8Tw0/JTHqBYrupgvu1iEiLODH /5NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=/NccK1jFXW34QMD4edfBoVFZyT/XuNmm+jtJeSLjLr4=; b=Cny607KeprMryryNzb+Bl/yntfnEa1uOYeUkXD6zxQRBqK0LS3MNifZ/RynpaDpNlR dBHHxHytgPlLfkbaGucLf0DPBT0J2zFYVup9vEK4HwfJozVFUi+QHQtfkRhgPqG7bG8T 3n44fde68y3GPA4NuiNoBE8iqeHcIYGfTkF16wCPn1EgJRz8imZf6oJNx2zSHSGEoRX3 qhQ0pfDrm3hOj5Gs4/IPITu6e0ai7pnZS89vccQi4P3REM05nzpGqc1PwzVD0KhKazgr y3/cqsCDZdTgSPIytY6DYU/3XknnWMpbbGw3Bd+LH6OrUS1PWIbXQPiwzp3HZ8PBlxAr l8TA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cw22si3259835edb.418.2020.05.07.07.10.34; Thu, 07 May 2020 07:10:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727924AbgEGOII (ORCPT + 99 others); Thu, 7 May 2020 10:08:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725964AbgEGOH1 (ORCPT ); Thu, 7 May 2020 10:07:27 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E46E3C05BD43; Thu, 7 May 2020 07:07:26 -0700 (PDT) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jWhBL-000281-GH; Thu, 07 May 2020 16:07:23 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 1C13A1C001A; Thu, 7 May 2020 16:07:23 +0200 (CEST) Date: Thu, 07 May 2020 14:07:23 -0000 From: "tip-bot2 for Christoph Hellwig" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/platform] x86/platform/uv: Remove the UV*_HUB_IS_SUPPORTED macros Cc: Christoph Hellwig , Thomas Gleixner , Russ Anderson , x86 , LKML In-Reply-To: <20200504171527.2845224-6-hch@lst.de> References: <20200504171527.2845224-6-hch@lst.de> MIME-Version: 1.0 Message-ID: <158886044307.8414.15217547118518717450.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/platform branch of tip: Commit-ID: cc1991058705a9cc4fe51ab6c2116df17922ef82 Gitweb: https://git.kernel.org/tip/cc1991058705a9cc4fe51ab6c2116df17922ef82 Author: Christoph Hellwig AuthorDate: Mon, 04 May 2020 19:15:21 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 07 May 2020 15:32:21 +02:00 x86/platform/uv: Remove the UV*_HUB_IS_SUPPORTED macros All of the macros are always defined to one. Remove them and the dead code keyed off them. Signed-off-by: Christoph Hellwig Signed-off-by: Thomas Gleixner Not-acked-by: Dimitri Sivanich Cc: Russ Anderson Link: https://lkml.kernel.org/r/20200504171527.2845224-6-hch@lst.de --- arch/x86/include/asm/uv/uv_hub.h | 19 ------------------- arch/x86/include/asm/uv/uv_mmrs.h | 7 ------- 2 files changed, 26 deletions(-) diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h index 950cd13..a998e65 100644 --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.h @@ -244,51 +244,32 @@ static inline int uv_hub_info_check(int version) #define UV4_HUB_REVISION_BASE 7 #define UV4A_HUB_REVISION_BASE 8 /* UV4 (fixed) rev 2 */ -/* WARNING: UVx_HUB_IS_SUPPORTED defines are deprecated and will be removed */ static inline int is_uv1_hub(void) { -#ifdef UV1_HUB_IS_SUPPORTED return is_uv_hubbed(uv(1)); -#else - return 0; -#endif } static inline int is_uv2_hub(void) { -#ifdef UV2_HUB_IS_SUPPORTED return is_uv_hubbed(uv(2)); -#else - return 0; -#endif } static inline int is_uv3_hub(void) { -#ifdef UV3_HUB_IS_SUPPORTED return is_uv_hubbed(uv(3)); -#else - return 0; -#endif } /* First test "is UV4A", then "is UV4" */ static inline int is_uv4a_hub(void) { -#ifdef UV4A_HUB_IS_SUPPORTED if (is_uv_hubbed(uv(4))) return (uv_hub_info->hub_revision == UV4A_HUB_REVISION_BASE); -#endif return 0; } static inline int is_uv4_hub(void) { -#ifdef UV4_HUB_IS_SUPPORTED return is_uv_hubbed(uv(4)); -#else - return 0; -#endif } static inline int is_uvx_hub(void) diff --git a/arch/x86/include/asm/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h index 62c79e2..9ee5ed6 100644 --- a/arch/x86/include/asm/uv/uv_mmrs.h +++ b/arch/x86/include/asm/uv/uv_mmrs.h @@ -99,13 +99,6 @@ #define UV3_HUB_PART_NUMBER_X 0x4321 #define UV4_HUB_PART_NUMBER 0x99a1 -/* Compat: Indicate which UV Hubs are supported. */ -#define UV1_HUB_IS_SUPPORTED 1 -#define UV2_HUB_IS_SUPPORTED 1 -#define UV3_HUB_IS_SUPPORTED 1 -#define UV4_HUB_IS_SUPPORTED 1 -#define UV4A_HUB_IS_SUPPORTED 1 - /* Error function to catch undefined references */ extern unsigned long uv_undefined(char *str);