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 <hch@lst.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Not-acked-by:  Dimitri Sivanich <sivanich@hpe.com>
Cc: Russ Anderson <rja@hpe.com>
Link: https://lkml.kernel.org/r/20200504171527.2845224-6-hch@lst.de

diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 950cd1395d5dd3bc65d5d03514d0d7236fe2f54d..a998e65e6a584b8b6eba44edb6f96053281ce7e7 100644 (file)
--- 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 62c79e26a59ace46ac4b7fc4a3a400e79dbedb70..9ee5ed6e8b3489ba251121ad50b7e83cbf4d1719 100644 (file)
--- 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);