iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: adc: bcm_iproc_adc: swap primary and secondary isr handler's

Browse Source 
The third argument of devm_request_threaded_irq() is the primary
handler. It is called in hardirq context and checks whether the
interrupt is relevant to the device. If the primary handler returns
IRQ_WAKE_THREAD, the secondary handler (a.k.a. handler thread) is
scheduled to run in process context.

bcm_iproc_adc.c uses the secondary handler as the primary one
and the other way around. So this patch fixes the same, along with
re-naming the secondary handler and primary handler names properly.

Tested on the BCM9583XX iProc SoC based boards.

Fixes: 4324c97ecedc ("iio: Add driver for Broadcom iproc-static-adc")
Reported-by: Pavel Roskin <plroskin@gmail.com>
Signed-off-by: Raveendra Padasalagi <raveendra.padasalagi@broadcom.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Raveendra Padasalagi 2017-05-16 12:22:42 +05:30 committed by Jonathan Cameron
parent 4eecbe8188
commit f7d86ecf83
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/iio/adc/bcm_iproc_adc.c
View File

@ -143,7 +143,7 @@ static void iproc_adc_reg_dump(struct iio_dev *indio_dev)
iproc_adc_dbg_reg(dev, adc_priv, IPROC_SOFT_BYPASS_DATA); iproc_adc_dbg_reg(dev, adc_priv, IPROC_SOFT_BYPASS_DATA);
} }
static irqreturn_t iproc_adc_interrupt_handler(int irq, void *data) static irqreturn_t iproc_adc_interrupt_thread(int irq, void *data)
{ {
u32 channel_intr_status; u32 channel_intr_status;
u32 intr_status; u32 intr_status;
@ -167,7 +167,7 @@ static irqreturn_t iproc_adc_interrupt_handler(int irq, void *data)
return IRQ_NONE; return IRQ_NONE;
} }
static irqreturn_t iproc_adc_interrupt_thread(int irq, void *data) static irqreturn_t iproc_adc_interrupt_handler(int irq, void *data)
{ {
irqreturn_t retval = IRQ_NONE; irqreturn_t retval = IRQ_NONE;
struct iproc_adc_priv *adc_priv; struct iproc_adc_priv *adc_priv;
@ -181,7 +181,7 @@ static irqreturn_t iproc_adc_interrupt_thread(int irq, void *data)
adc_priv = iio_priv(indio_dev); adc_priv = iio_priv(indio_dev);
regmap_read(adc_priv->regmap, IPROC_INTERRUPT_STATUS, &intr_status); regmap_read(adc_priv->regmap, IPROC_INTERRUPT_STATUS, &intr_status);
dev_dbg(&indio_dev->dev, "iproc_adc_interrupt_thread(),INTRPT_STS:%x\n", dev_dbg(&indio_dev->dev, "iproc_adc_interrupt_handler(),INTRPT_STS:%x\n",
intr_status); intr_status);
intr_channels = (intr_status & IPROC_ADC_INTR_MASK) >> IPROC_ADC_INTR; intr_channels = (intr_status & IPROC_ADC_INTR_MASK) >> IPROC_ADC_INTR;
@ -566,8 +566,8 @@ static int iproc_adc_probe(struct platform_device *pdev)
} }
ret = devm_request_threaded_irq(&pdev->dev, adc_priv->irqno, ret = devm_request_threaded_irq(&pdev->dev, adc_priv->irqno,
iproc_adc_interrupt_thread,
iproc_adc_interrupt_handler, iproc_adc_interrupt_handler,
iproc_adc_interrupt_thread,
IRQF_SHARED, "iproc-adc", indio_dev); IRQF_SHARED, "iproc-adc", indio_dev);
if (ret) { if (ret) {
dev_err(&pdev->dev, "request_irq error %d\n", ret); dev_err(&pdev->dev, "request_irq error %d\n", ret);