mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 01:55:51 +02:00
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>
This commit is contained in:
parent
a474d5cbdf
commit
a3c9f67859
|
|
@ -181,9 +181,8 @@ static void ingenic_adc_set_config(struct ingenic_adc *adc,
|
|||
mutex_unlock(&adc->lock);
|
||||
}
|
||||
|
||||
static void ingenic_adc_enable_unlocked(struct ingenic_adc *adc,
|
||||
int engine,
|
||||
bool enabled)
|
||||
static void __ingenic_adc_enable(struct ingenic_adc *adc, int engine,
|
||||
bool enabled)
|
||||
{
|
||||
u8 val;
|
||||
|
||||
|
|
@ -202,7 +201,7 @@ static void ingenic_adc_enable(struct ingenic_adc *adc,
|
|||
bool enabled)
|
||||
{
|
||||
mutex_lock(&adc->lock);
|
||||
ingenic_adc_enable_unlocked(adc, engine, enabled);
|
||||
__ingenic_adc_enable(adc, engine, enabled);
|
||||
mutex_unlock(&adc->lock);
|
||||
}
|
||||
|
||||
|
|
@ -222,11 +221,11 @@ static int ingenic_adc_capture(struct ingenic_adc *adc,
|
|||
cfg = readl(adc->base + JZ_ADC_REG_CFG);
|
||||
writel(cfg & ~JZ_ADC_REG_CFG_CMD_SEL, adc->base + JZ_ADC_REG_CFG);
|
||||
|
||||
ingenic_adc_enable_unlocked(adc, engine, true);
|
||||
__ingenic_adc_enable(adc, engine, true);
|
||||
ret = readb_poll_timeout(adc->base + JZ_ADC_REG_ENABLE, val,
|
||||
!(val & BIT(engine)), 250, 1000);
|
||||
if (ret)
|
||||
ingenic_adc_enable_unlocked(adc, engine, false);
|
||||
__ingenic_adc_enable(adc, engine, false);
|
||||
|
||||
writel(cfg, adc->base + JZ_ADC_REG_CFG);
|
||||
mutex_unlock(&adc->lock);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user