Skip to content

Commit cc19910

Browse files
Christoph HellwigKAGA-KOKO
authored andcommitted
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Not-acked-by: Dimitri Sivanich <[email protected]> Cc: Russ Anderson <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 2bd04b6 commit cc19910

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

arch/x86/include/asm/uv/uv_hub.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -244,51 +244,32 @@ static inline int uv_hub_info_check(int version)
244244
#define UV4_HUB_REVISION_BASE 7
245245
#define UV4A_HUB_REVISION_BASE 8 /* UV4 (fixed) rev 2 */
246246

247-
/* WARNING: UVx_HUB_IS_SUPPORTED defines are deprecated and will be removed */
248247
static inline int is_uv1_hub(void)
249248
{
250-
#ifdef UV1_HUB_IS_SUPPORTED
251249
return is_uv_hubbed(uv(1));
252-
#else
253-
return 0;
254-
#endif
255250
}
256251

257252
static inline int is_uv2_hub(void)
258253
{
259-
#ifdef UV2_HUB_IS_SUPPORTED
260254
return is_uv_hubbed(uv(2));
261-
#else
262-
return 0;
263-
#endif
264255
}
265256

266257
static inline int is_uv3_hub(void)
267258
{
268-
#ifdef UV3_HUB_IS_SUPPORTED
269259
return is_uv_hubbed(uv(3));
270-
#else
271-
return 0;
272-
#endif
273260
}
274261

275262
/* First test "is UV4A", then "is UV4" */
276263
static inline int is_uv4a_hub(void)
277264
{
278-
#ifdef UV4A_HUB_IS_SUPPORTED
279265
if (is_uv_hubbed(uv(4)))
280266
return (uv_hub_info->hub_revision == UV4A_HUB_REVISION_BASE);
281-
#endif
282267
return 0;
283268
}
284269

285270
static inline int is_uv4_hub(void)
286271
{
287-
#ifdef UV4_HUB_IS_SUPPORTED
288272
return is_uv_hubbed(uv(4));
289-
#else
290-
return 0;
291-
#endif
292273
}
293274

294275
static inline int is_uvx_hub(void)

arch/x86/include/asm/uv/uv_mmrs.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@
9999
#define UV3_HUB_PART_NUMBER_X 0x4321
100100
#define UV4_HUB_PART_NUMBER 0x99a1
101101

102-
/* Compat: Indicate which UV Hubs are supported. */
103-
#define UV1_HUB_IS_SUPPORTED 1
104-
#define UV2_HUB_IS_SUPPORTED 1
105-
#define UV3_HUB_IS_SUPPORTED 1
106-
#define UV4_HUB_IS_SUPPORTED 1
107-
#define UV4A_HUB_IS_SUPPORTED 1
108-
109102
/* Error function to catch undefined references */
110103
extern unsigned long uv_undefined(char *str);
111104

0 commit comments

Comments
 (0)