powerpc/xive: Remove (almost) unused macros (8a792262) · Commits · 戴 / test

The GETFIELD and SETFIELD macros in xive-regs.h aren't used except for a single instance of GETFIELD, so replace that and remove them. These macros are also defined in vas.h, so either those should be eventually replaced or the macros moved into bitops.h. Signed-off-by:

Russell Currey <ruscur@russell.cc> [mpe: Rewrite the assignment to 'he' to avoid ffs() etc.] Signed-off-by:

Michael Ellerman <mpe@ellerman.id.au>

arch/powerpc/include/asm/xive-regs.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -123,10 +123,4 @@
		#define TM_QW3_NSR_I PPC_BIT8(2)
		#define TM_QW3_NSR_GRP_LVL PPC_BIT8(3,7)

		/* Utilities to manipulate these (originaly from OPAL) */
		#define MASK_TO_LSH(m) (__builtin_ffsl(m) - 1)
		#define GETFIELD(m, v) (((v) & (m)) >> MASK_TO_LSH(m))
		#define SETFIELD(m, v, val) \
		(((v) & ~(m)) \| ((((typeof(v))(val)) << MASK_TO_LSH(m)) & (m)))

		#endif /* _ASM_POWERPC_XIVE_REGS_H */

arch/powerpc/sysdev/xive/native.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ static void xive_native_update_pending(struct xive_cpu *xc)
		* of the hypervisor interrupt (if any)
		*/
		cppr = ack & 0xff;
		he = GETFIELD(TM_QW3_NSR_HE, (ack >> 8));
		he = (ack >> 8) >> 6;
		switch(he) {
		case TM_QW3_NSR_HE_NONE: /* Nothing to see here */
		break;

Admin message