diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-05 01:18:31 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-05 01:19:51 -0500 |
commit | 75072323a2968c1bd1b74a48ebf5a5d7e5e10183 (patch) | |
tree | 5b8b9ff5ec067430e4b36d15d89c1986bee5522a /drivers/input/touchscreen/ucb1400_ts.c | |
parent | 9fea929121935957b4045282fff973d966a98f06 (diff) |
Input: ucb1400_ts - drop inline annotations
Let compiler figure out which ones makes most sense to inline.
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen/ucb1400_ts.c')
-rw-r--r-- | drivers/input/touchscreen/ucb1400_ts.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index 4ac30ca9c3b4..36ff1549434b 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
@@ -35,7 +35,7 @@ static int ts_delay = 55; /* us */ | |||
35 | static int ts_delay_pressure; /* us */ | 35 | static int ts_delay_pressure; /* us */ |
36 | 36 | ||
37 | /* Switch to interrupt mode. */ | 37 | /* Switch to interrupt mode. */ |
38 | static inline void ucb1400_ts_mode_int(struct snd_ac97 *ac97) | 38 | static void ucb1400_ts_mode_int(struct snd_ac97 *ac97) |
39 | { | 39 | { |
40 | ucb1400_reg_write(ac97, UCB_TS_CR, | 40 | ucb1400_reg_write(ac97, UCB_TS_CR, |
41 | UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW | | 41 | UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW | |
@@ -47,7 +47,7 @@ static inline void ucb1400_ts_mode_int(struct snd_ac97 *ac97) | |||
47 | * Switch to pressure mode, and read pressure. We don't need to wait | 47 | * Switch to pressure mode, and read pressure. We don't need to wait |
48 | * here, since both plates are being driven. | 48 | * here, since both plates are being driven. |
49 | */ | 49 | */ |
50 | static inline unsigned int ucb1400_ts_read_pressure(struct ucb1400_ts *ucb) | 50 | static unsigned int ucb1400_ts_read_pressure(struct ucb1400_ts *ucb) |
51 | { | 51 | { |
52 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, | 52 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, |
53 | UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW | | 53 | UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW | |
@@ -63,7 +63,7 @@ static inline unsigned int ucb1400_ts_read_pressure(struct ucb1400_ts *ucb) | |||
63 | * gives a faster response time. Even so, we need to wait about 55us | 63 | * gives a faster response time. Even so, we need to wait about 55us |
64 | * for things to stabilise. | 64 | * for things to stabilise. |
65 | */ | 65 | */ |
66 | static inline unsigned int ucb1400_ts_read_xpos(struct ucb1400_ts *ucb) | 66 | static unsigned int ucb1400_ts_read_xpos(struct ucb1400_ts *ucb) |
67 | { | 67 | { |
68 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, | 68 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, |
69 | UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW | | 69 | UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW | |
@@ -86,7 +86,7 @@ static inline unsigned int ucb1400_ts_read_xpos(struct ucb1400_ts *ucb) | |||
86 | * gives a faster response time. Even so, we need to wait about 55us | 86 | * gives a faster response time. Even so, we need to wait about 55us |
87 | * for things to stabilise. | 87 | * for things to stabilise. |
88 | */ | 88 | */ |
89 | static inline unsigned int ucb1400_ts_read_ypos(struct ucb1400_ts *ucb) | 89 | static int ucb1400_ts_read_ypos(struct ucb1400_ts *ucb) |
90 | { | 90 | { |
91 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, | 91 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, |
92 | UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW | | 92 | UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW | |
@@ -107,7 +107,7 @@ static inline unsigned int ucb1400_ts_read_ypos(struct ucb1400_ts *ucb) | |||
107 | * Switch to X plate resistance mode. Set MX to ground, PX to | 107 | * Switch to X plate resistance mode. Set MX to ground, PX to |
108 | * supply. Measure current. | 108 | * supply. Measure current. |
109 | */ | 109 | */ |
110 | static inline unsigned int ucb1400_ts_read_xres(struct ucb1400_ts *ucb) | 110 | static unsigned int ucb1400_ts_read_xres(struct ucb1400_ts *ucb) |
111 | { | 111 | { |
112 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, | 112 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, |
113 | UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW | | 113 | UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW | |
@@ -119,7 +119,7 @@ static inline unsigned int ucb1400_ts_read_xres(struct ucb1400_ts *ucb) | |||
119 | * Switch to Y plate resistance mode. Set MY to ground, PY to | 119 | * Switch to Y plate resistance mode. Set MY to ground, PY to |
120 | * supply. Measure current. | 120 | * supply. Measure current. |
121 | */ | 121 | */ |
122 | static inline unsigned int ucb1400_ts_read_yres(struct ucb1400_ts *ucb) | 122 | static unsigned int ucb1400_ts_read_yres(struct ucb1400_ts *ucb) |
123 | { | 123 | { |
124 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, | 124 | ucb1400_reg_write(ucb->ac97, UCB_TS_CR, |
125 | UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW | | 125 | UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW | |
@@ -127,21 +127,21 @@ static inline unsigned int ucb1400_ts_read_yres(struct ucb1400_ts *ucb) | |||
127 | return ucb1400_adc_read(ucb->ac97, 0, adcsync); | 127 | return ucb1400_adc_read(ucb->ac97, 0, adcsync); |
128 | } | 128 | } |
129 | 129 | ||
130 | static inline int ucb1400_ts_pen_up(struct snd_ac97 *ac97) | 130 | static int ucb1400_ts_pen_up(struct snd_ac97 *ac97) |
131 | { | 131 | { |
132 | unsigned short val = ucb1400_reg_read(ac97, UCB_TS_CR); | 132 | unsigned short val = ucb1400_reg_read(ac97, UCB_TS_CR); |
133 | 133 | ||
134 | return val & (UCB_TS_CR_TSPX_LOW | UCB_TS_CR_TSMX_LOW); | 134 | return val & (UCB_TS_CR_TSPX_LOW | UCB_TS_CR_TSMX_LOW); |
135 | } | 135 | } |
136 | 136 | ||
137 | static inline void ucb1400_ts_irq_enable(struct snd_ac97 *ac97) | 137 | static void ucb1400_ts_irq_enable(struct snd_ac97 *ac97) |
138 | { | 138 | { |
139 | ucb1400_reg_write(ac97, UCB_IE_CLEAR, UCB_IE_TSPX); | 139 | ucb1400_reg_write(ac97, UCB_IE_CLEAR, UCB_IE_TSPX); |
140 | ucb1400_reg_write(ac97, UCB_IE_CLEAR, 0); | 140 | ucb1400_reg_write(ac97, UCB_IE_CLEAR, 0); |
141 | ucb1400_reg_write(ac97, UCB_IE_FAL, UCB_IE_TSPX); | 141 | ucb1400_reg_write(ac97, UCB_IE_FAL, UCB_IE_TSPX); |
142 | } | 142 | } |
143 | 143 | ||
144 | static inline void ucb1400_ts_irq_disable(struct snd_ac97 *ac97) | 144 | static void ucb1400_ts_irq_disable(struct snd_ac97 *ac97) |
145 | { | 145 | { |
146 | ucb1400_reg_write(ac97, UCB_IE_FAL, 0); | 146 | ucb1400_reg_write(ac97, UCB_IE_FAL, 0); |
147 | } | 147 | } |