leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/platform/uv: Remove the UV*_HUB_IS_SUPPORTED macros

Browse Source 
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
This commit is contained in:
Christoph Hellwig
2020-05-04 19:15:21 +02:00
committed by Thomas Gleixner
parent 2bd04b6fe4
commit cc19910587
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86/include/asm/uv/uv_hub.h
View File

@@ -244,51 +244,32 @@ static inline int uv_hub_info_check(int version)
#define UV4_HUB_REVISION_BASE 7 #define UV4_HUB_REVISION_BASE 7
#define UV4A_HUB_REVISION_BASE 8 /* UV4 (fixed) rev 2 */ #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) static inline int is_uv1_hub(void)
{ {
#ifdef UV1_HUB_IS_SUPPORTED
return is_uv_hubbed(uv(1)); return is_uv_hubbed(uv(1));
#else
return 0;
#endif
} }
static inline int is_uv2_hub(void) static inline int is_uv2_hub(void)
{ {
#ifdef UV2_HUB_IS_SUPPORTED
return is_uv_hubbed(uv(2)); return is_uv_hubbed(uv(2));
#else
return 0;
#endif
} }
static inline int is_uv3_hub(void) static inline int is_uv3_hub(void)
{ {
#ifdef UV3_HUB_IS_SUPPORTED
return is_uv_hubbed(uv(3)); return is_uv_hubbed(uv(3));
#else
return 0;
#endif
} }
/* First test "is UV4A", then "is UV4" */ /* First test "is UV4A", then "is UV4" */
static inline int is_uv4a_hub(void) static inline int is_uv4a_hub(void)
{ {
#ifdef UV4A_HUB_IS_SUPPORTED
if (is_uv_hubbed(uv(4))) if (is_uv_hubbed(uv(4)))
return (uv_hub_info->hub_revision == UV4A_HUB_REVISION_BASE); return (uv_hub_info->hub_revision == UV4A_HUB_REVISION_BASE);
#endif
return 0; return 0;
} }
static inline int is_uv4_hub(void) static inline int is_uv4_hub(void)
{ {
#ifdef UV4_HUB_IS_SUPPORTED
return is_uv_hubbed(uv(4)); return is_uv_hubbed(uv(4));
#else
return 0;
#endif
} }
static inline int is_uvx_hub(void) static inline int is_uvx_hub(void)

7
arch/x86/include/asm/uv/uv_mmrs.h
View File

@@ -99,13 +99,6 @@
#define UV3_HUB_PART_NUMBER_X 0x4321 #define UV3_HUB_PART_NUMBER_X 0x4321
#define UV4_HUB_PART_NUMBER 0x99a1 #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 */ /* Error function to catch undefined references */
extern unsigned long uv_undefined(char *str); extern unsigned long uv_undefined(char *str);