| Message ID | 20231102-x86-apic-v1-2-bf049a2a0ed6@citrix.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | x86/apic: Misc pruning | expand |
On Thu, Nov 02, 2023 at 12:26:20PM +0000, Andrew Cooper wrote: > The type is not used any more. > > Replace the constants with plain defines so they can live outside of an > __ASSEMBLY__ block, allowing for more cleanup in subsequent changes. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reveiewed-by: Steve Wahl <steve.wahl@hpe.com> > --- > arch/x86/include/asm/apicdef.h | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h > index 4b125e5b3187..ddcbf00db19d 100644 > --- a/arch/x86/include/asm/apicdef.h > +++ b/arch/x86/include/asm/apicdef.h > @@ -20,6 +20,13 @@ > */ > #define IO_APIC_SLOT_SIZE 1024 > > +#define APIC_DELIVERY_MODE_FIXED 0 > +#define APIC_DELIVERY_MODE_LOWESTPRIO 1 > +#define APIC_DELIVERY_MODE_SMI 2 > +#define APIC_DELIVERY_MODE_NMI 4 > +#define APIC_DELIVERY_MODE_INIT 5 > +#define APIC_DELIVERY_MODE_EXTINT 7 > + > #define APIC_ID 0x20 > > #define APIC_LVR 0x30 > @@ -430,14 +437,5 @@ struct local_apic { > #define BAD_APICID 0xFFFFu > #endif > > -enum apic_delivery_modes { > - APIC_DELIVERY_MODE_FIXED = 0, > - APIC_DELIVERY_MODE_LOWESTPRIO = 1, > - APIC_DELIVERY_MODE_SMI = 2, > - APIC_DELIVERY_MODE_NMI = 4, > - APIC_DELIVERY_MODE_INIT = 5, > - APIC_DELIVERY_MODE_EXTINT = 7, > -}; > - > #endif /* !__ASSEMBLY__ */ > #endif /* _ASM_X86_APICDEF_H */ > > -- > 2.30.2 >
diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h index 4b125e5b3187..ddcbf00db19d 100644 --- a/arch/x86/include/asm/apicdef.h +++ b/arch/x86/include/asm/apicdef.h @@ -20,6 +20,13 @@ */ #define IO_APIC_SLOT_SIZE 1024 +#define APIC_DELIVERY_MODE_FIXED 0 +#define APIC_DELIVERY_MODE_LOWESTPRIO 1 +#define APIC_DELIVERY_MODE_SMI 2 +#define APIC_DELIVERY_MODE_NMI 4 +#define APIC_DELIVERY_MODE_INIT 5 +#define APIC_DELIVERY_MODE_EXTINT 7 + #define APIC_ID 0x20 #define APIC_LVR 0x30 @@ -430,14 +437,5 @@ struct local_apic { #define BAD_APICID 0xFFFFu #endif -enum apic_delivery_modes { - APIC_DELIVERY_MODE_FIXED = 0, - APIC_DELIVERY_MODE_LOWESTPRIO = 1, - APIC_DELIVERY_MODE_SMI = 2, - APIC_DELIVERY_MODE_NMI = 4, - APIC_DELIVERY_MODE_INIT = 5, - APIC_DELIVERY_MODE_EXTINT = 7, -}; - #endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_APICDEF_H */
The type is not used any more. Replace the constants with plain defines so they can live outside of an __ASSEMBLY__ block, allowing for more cleanup in subsequent changes. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- arch/x86/include/asm/apicdef.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)