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

Input: wm97xx - remove redundant define

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by

Wolfram Sang and committed by
Dmitry Torokhov 2456689b 5f098ecd

+10 -11
+1 -1
drivers/input/touchscreen/atmel-wm97xx.c
··· 164 164 165 165 data = ac97c_readl(atmel_wm97xx, CBRHR); 166 166 value = data & 0x0fff; 167 - source = data & WM97XX_ADCSRC_MASK; 167 + source = data & WM97XX_ADCSEL_MASK; 168 168 pen_down = (data & WM97XX_PEN_DOWN) >> 8; 169 169 170 170 if (source == WM97XX_ADCSEL_X)
+3 -3
drivers/input/touchscreen/mainstone-wm97xx.c
··· 157 157 x, y, p); 158 158 159 159 /* are samples valid */ 160 - if ((x & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_X || 161 - (y & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_Y || 162 - (p & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_PRES) 160 + if ((x & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_X || 161 + (y & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_Y || 162 + (p & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_PRES) 163 163 goto up; 164 164 165 165 /* coordinate is good */
+2 -2
drivers/input/touchscreen/wm9713.c
··· 304 304 wm->mach_ops->post_sample(adcsel); 305 305 306 306 /* check we have correct sample */ 307 - if ((*sample & WM97XX_ADCSRC_MASK) != ffs(adcsel >> 1) << 12) { 307 + if ((*sample & WM97XX_ADCSEL_MASK) != ffs(adcsel >> 1) << 12) { 308 308 dev_dbg(wm->dev, "adc wrong sample, read %x got %x", adcsel, 309 - *sample & WM97XX_ADCSRC_MASK); 309 + *sample & WM97XX_ADCSEL_MASK); 310 310 return RC_PENUP; 311 311 } 312 312
+3 -3
drivers/input/touchscreen/zylonite-wm97xx.c
··· 122 122 x, y, p); 123 123 124 124 /* are samples valid */ 125 - if ((x & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_X || 126 - (y & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_Y || 127 - (p & WM97XX_ADCSRC_MASK) != WM97XX_ADCSEL_PRES) 125 + if ((x & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_X || 126 + (y & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_Y || 127 + (p & WM97XX_ADCSEL_MASK) != WM97XX_ADCSEL_PRES) 128 128 goto up; 129 129 130 130 /* coordinate is good */
+1 -2
include/linux/wm97xx.h
··· 38 38 #define WM97XX_ADCSEL_X 0x1000 /* x coord measurement */ 39 39 #define WM97XX_ADCSEL_Y 0x2000 /* y coord measurement */ 40 40 #define WM97XX_ADCSEL_PRES 0x3000 /* pressure measurement */ 41 - #define WM97XX_ADCSEL_MASK 0x7000 41 + #define WM97XX_ADCSEL_MASK 0x7000 /* ADC selection mask */ 42 42 #define WM97XX_COO 0x0800 /* enable coordinate mode */ 43 43 #define WM97XX_CTC 0x0400 /* enable continuous mode */ 44 44 #define WM97XX_CM_RATE_93 0x0000 /* 93.75Hz continuous rate */ ··· 61 61 #define WM97XX_PRP_DET_DIG 0xc000 /* setect on, digitise on */ 62 62 #define WM97XX_RPR 0x2000 /* wake up on pen down */ 63 63 #define WM97XX_PEN_DOWN 0x8000 /* pen is down */ 64 - #define WM97XX_ADCSRC_MASK 0x7000 /* ADC source mask */ 65 64 66 65 #define WM97XX_AUX_ID1 0x8001 67 66 #define WM97XX_AUX_ID2 0x8002