Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8c44319 authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

Replace __attribute_pure__ with __pure 



To be consistent with the use of attributes in the rest of the kernel
replace all use of __attribute_pure__ with __pure and delete the definition
of __attribute_pure__.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
Cc: Bryan Wu <bryan.wu@analog.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c80544dc

arch/arm/nwfpe/fpopcode.h

+3 −3
Original line number Diff line number Diff line
@@ -369,20 +369,20 @@ TABLE 5 
#define getRoundingMode(opcode)		((opcode & MASK_ROUNDING_MODE) >> 5)



#ifdef CONFIG_FPE_NWFPE_XP

static inline __attribute_pure__ floatx80 getExtendedConstant(const unsigned int nIndex)

static inline floatx80 __pure getExtendedConstant(const unsigned int nIndex)

{

	extern const floatx80 floatx80Constant[];

	return floatx80Constant[nIndex];

}

#endif



static inline __attribute_pure__ float64 getDoubleConstant(const unsigned int nIndex)

static inline float64 __pure getDoubleConstant(const unsigned int nIndex)

{

	extern const float64 float64Constant[];

	return float64Constant[nIndex];

}



static inline __attribute_pure__ float32 getSingleConstant(const unsigned int nIndex)

static inline float32 __pure getSingleConstant(const unsigned int nIndex)

{

	extern const float32 float32Constant[];

	return float32Constant[nIndex];

drivers/media/video/v4l1-compat.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ const static unsigned int palette2pixelformat[] = { 
	[VIDEO_PALETTE_YUV422P] = V4L2_PIX_FMT_YUV422P,

};



static unsigned int __attribute_pure__

static unsigned int __pure

palette_to_pixelformat(unsigned int palette)

{

	if (palette < ARRAY_SIZE(palette2pixelformat))

include/asm-blackfin/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -104,13 +104,13 @@ unsigned long get_wchan(struct task_struct *p); 
#define cpu_relax()    	barrier()



/* Get the Silicon Revision of the chip */

static inline __attribute_pure__ uint32_t bfin_revid(void)

static inline uint32_t __pure bfin_revid(void)

{

	/* stored in the upper 4 bits */

	return bfin_read_CHIPID() >> 28;

}



static inline __attribute_pure__ uint32_t bfin_compiled_revid(void)

static inline uint32_t __pure bfin_compiled_revid(void)

{

#if defined(CONFIG_BF_REV_0_0)

	return 0;

include/asm-ppc/time.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static __inline__ void set_dec(unsigned int val) 
/* Accessor functions for the timebase (RTC on 601) registers. */

/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */

#ifdef CONFIG_6xx

extern __inline__ int __attribute_pure__ __USE_RTC(void) {

extern __inline__ int __pure __USE_RTC(void) {

	return (mfspr(SPRN_PVR)>>16) == 1;

}

#else

include/linux/compiler-gcc.h

+11 −1
Original line number Diff line number Diff line
@@ -36,10 +36,20 @@ 
#define __weak				__attribute__((weak))

#define __naked				__attribute__((naked))

#define __noreturn			__attribute__((noreturn))



/*

 * From the GCC manual:

 *

 * Many functions have no effects except the return value and their

 * return value depends only on the parameters and/or global

 * variables.  Such a function can be subject to common subexpression

 * elimination and loop optimization just as an arithmetic operator

 * would be.

 * [...]

 */

#define __pure				__attribute__((pure))

#define __aligned(x)			__attribute__((aligned(x)))

#define __printf(a,b)			__attribute__((format(printf,a,b)))

#define  noinline			__attribute__((noinline))

#define __attribute_pure__		__attribute__((pure))

#define __attribute_const__		__attribute__((__const__))

#define __maybe_unused			__attribute__((unused))