diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2009-05-27 09:22:58 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-27 09:25:05 -0400 |
| commit | cbf806dd9302f3ff27ba496dae474b9da6b58873 (patch) | |
| tree | 083051bf123c7bc52bcdc53918a82fb1ca470067 /include/linux | |
| parent | 10494dce0b43ed3212abde64bf759705ee3c56ef (diff) | |
Input: ucb1400 - move static function from header into core
it's a little too large for static line.
The ts is currently the only mainline user but Marek Vasut claims that
there is a battery driver in an ARM tree which also needs this function.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ucb1400.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h index 970473bf8d5a..ed889f4168f3 100644 --- a/include/linux/ucb1400.h +++ b/include/linux/ucb1400.h | |||
| @@ -134,28 +134,13 @@ static inline void ucb1400_adc_enable(struct snd_ac97 *ac97) | |||
| 134 | ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA); | 134 | ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA); |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | static unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel, | ||
| 138 | int adcsync) | ||
| 139 | { | ||
| 140 | unsigned int val; | ||
| 141 | |||
| 142 | if (adcsync) | ||
| 143 | adc_channel |= UCB_ADC_SYNC_ENA; | ||
| 144 | |||
| 145 | ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel); | ||
| 146 | ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel | | ||
| 147 | UCB_ADC_START); | ||
| 148 | |||
| 149 | while (!((val = ucb1400_reg_read(ac97, UCB_ADC_DATA)) | ||
| 150 | & UCB_ADC_DAT_VALID)) | ||
| 151 | schedule_timeout_uninterruptible(1); | ||
| 152 | |||
| 153 | return val & UCB_ADC_DAT_MASK; | ||
| 154 | } | ||
| 155 | |||
| 156 | static inline void ucb1400_adc_disable(struct snd_ac97 *ac97) | 137 | static inline void ucb1400_adc_disable(struct snd_ac97 *ac97) |
| 157 | { | 138 | { |
| 158 | ucb1400_reg_write(ac97, UCB_ADC_CR, 0); | 139 | ucb1400_reg_write(ac97, UCB_ADC_CR, 0); |
| 159 | } | 140 | } |
| 160 | 141 | ||
| 142 | |||
| 143 | unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel, | ||
| 144 | int adcsync); | ||
| 145 | |||
| 161 | #endif | 146 | #endif |
