Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: ixp4xx: Remove feature bit accessors

We switched users of the accessors over to using syscon to inspect
the bits, or removed the need for checking them. Delete these
accessors.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20220211223238.648934-11-linus.walleij@linaro.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

-31
-21
arch/arm/mach-ixp4xx/common.c
··· 43 43 44 44 #include "irqs.h" 45 45 46 - u32 ixp4xx_read_feature_bits(void) 47 - { 48 - u32 val = ~__raw_readl(IXP4XX_EXP_CFG2); 49 - 50 - if (cpu_is_ixp42x_rev_a0()) 51 - return IXP42X_FEATURE_MASK & ~(IXP4XX_FEATURE_RCOMP | 52 - IXP4XX_FEATURE_AES); 53 - if (cpu_is_ixp42x()) 54 - return val & IXP42X_FEATURE_MASK; 55 - if (cpu_is_ixp43x()) 56 - return val & IXP43X_FEATURE_MASK; 57 - return val & IXP46X_FEATURE_MASK; 58 - } 59 - EXPORT_SYMBOL(ixp4xx_read_feature_bits); 60 - 61 - void ixp4xx_write_feature_bits(u32 value) 62 - { 63 - __raw_writel(~value, IXP4XX_EXP_CFG2); 64 - } 65 - EXPORT_SYMBOL(ixp4xx_write_feature_bits); 66 - 67 46 #define IXP4XX_TIMER_FREQ 66666000 68 47 69 48 /*************************************************************************
-10
include/linux/soc/ixp4xx/cpu.h
··· 90 90 IXP43X_PROCESSOR_ID_VALUE) 91 91 #define cpu_is_ixp46x() ((read_cpuid_id() & IXP46X_PROCESSOR_ID_MASK) == \ 92 92 IXP46X_PROCESSOR_ID_VALUE) 93 - 94 - u32 ixp4xx_read_feature_bits(void); 95 - void ixp4xx_write_feature_bits(u32 value); 96 93 static inline u32 cpu_ixp4xx_features(struct regmap *rmap) 97 94 { 98 95 u32 val; ··· 111 114 #define cpu_is_ixp42x() 0 112 115 #define cpu_is_ixp43x() 0 113 116 #define cpu_is_ixp46x() 0 114 - static inline u32 ixp4xx_read_feature_bits(void) 115 - { 116 - return 0; 117 - } 118 - static inline void ixp4xx_write_feature_bits(u32 value) 119 - { 120 - } 121 117 static inline u32 cpu_ixp4xx_features(struct regmap *rmap) 122 118 { 123 119 return 0;