Skip to content

Commit a3c9f67

Browse files
Felipe Ribeiro de Souzajic23
authored andcommitted
iio: adc: ingenic-adc: rename ingenic_adc_enable_unlocked() function
Rename ingenic_adc_enable_unlocked() to __ingenic_adc_enable() to better reflect that this helper must be called with the lock held. Signed-off-by: Felipe Ribeiro de Souza <felipers@ime.usp.br> Co-developed-by: Lucas Ivars Cadima Ciziks <lucas@ciziks.com> Signed-off-by: Lucas Ivars Cadima Ciziks <lucas@ciziks.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
1 parent a474d5c commit a3c9f67

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

drivers/iio/adc/ingenic-adc.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,8 @@ static void ingenic_adc_set_config(struct ingenic_adc *adc,
181181
mutex_unlock(&adc->lock);
182182
}
183183

184-
static void ingenic_adc_enable_unlocked(struct ingenic_adc *adc,
185-
int engine,
186-
bool enabled)
184+
static void __ingenic_adc_enable(struct ingenic_adc *adc, int engine,
185+
bool enabled)
187186
{
188187
u8 val;
189188

@@ -202,7 +201,7 @@ static void ingenic_adc_enable(struct ingenic_adc *adc,
202201
bool enabled)
203202
{
204203
mutex_lock(&adc->lock);
205-
ingenic_adc_enable_unlocked(adc, engine, enabled);
204+
__ingenic_adc_enable(adc, engine, enabled);
206205
mutex_unlock(&adc->lock);
207206
}
208207

@@ -222,11 +221,11 @@ static int ingenic_adc_capture(struct ingenic_adc *adc,
222221
cfg = readl(adc->base + JZ_ADC_REG_CFG);
223222
writel(cfg & ~JZ_ADC_REG_CFG_CMD_SEL, adc->base + JZ_ADC_REG_CFG);
224223

225-
ingenic_adc_enable_unlocked(adc, engine, true);
224+
__ingenic_adc_enable(adc, engine, true);
226225
ret = readb_poll_timeout(adc->base + JZ_ADC_REG_ENABLE, val,
227226
!(val & BIT(engine)), 250, 1000);
228227
if (ret)
229-
ingenic_adc_enable_unlocked(adc, engine, false);
228+
__ingenic_adc_enable(adc, engine, false);
230229

231230
writel(cfg, adc->base + JZ_ADC_REG_CFG);
232231
mutex_unlock(&adc->lock);

0 commit comments

Comments
 (0)