From: Fabio Estevam <fabio.estevam@freescale.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Fabio Estevam <festevam@gmail.com>, <sameo@linux.intel.com>,
Marek Vasut <marex@denx.de>, <ashish.jangam@kpitcummins.com>,
<dchen@diasemi.com>, <arnd@arndb.de>, <kernel@pengutronix.de>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] mfd: da9052-core: Use regmap_irq_get_virq() and fix the probe
Date: Fri, 28 Sep 2012 11:33:24 -0300 [thread overview]
Message-ID: <5065B534.7040602@freescale.com> (raw)
In-Reply-To: <20120928104944.GB30869@opensource.wolfsonmicro.com>
Hi Mark,
Mark Brown wrote:
> On Thu, Sep 27, 2012 at 10:57:38PM -0300, Fabio Estevam wrote:
>
>> - da9052->irq_base = regmap_irq_chip_get_base(da9052->irq_data);
>> + da9052->irq = regmap_irq_get_virq(da9052->irq_data, DA9052_IRQ_ADC_EOM);
>>
>> - ret = request_threaded_irq(DA9052_IRQ_ADC_EOM, NULL, da9052_auxadc_irq,
>> + if (da9052->irq < 0) {
>> + ret = da9052->irq;
>> + dev_err(da9052->dev, "regmap_irq_get_virq failed: %d\n", ret);
>> + goto regmap_err;
>> + }
>> +
>> + ret = request_threaded_irq(da9052->irq, NULL, da9052_auxadc_irq,
>
> This will fix the problem but the usage of da9052->irq here is very odd,
> normally that'd be the primary IRQ for the device but this is actually
> just the interrupt for the ADC.
>
> Otherwise
>
> Reviwed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
>
Would you prefer the version below? If so, I can send it as v3:
diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c
index a0a62b2..4f74bf6 100644
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@ -782,35 +782,41 @@ int __devinit da9052_device_init(struct da9052 *da9052, u8 chip_id)
da9052->chip_id = chip_id;
- if (!pdata || !pdata->irq_base)
- da9052->irq_base = -1;
- else
- da9052->irq_base = pdata->irq_base;
-
ret = regmap_add_irq_chip(da9052->regmap, da9052->chip_irq,
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
- da9052->irq_base, &da9052_regmap_irq_chip,
+ -1, &da9052_regmap_irq_chip,
&da9052->irq_data);
- if (ret < 0)
+ if (ret < 0) {
+ dev_err(da9052->dev, "regmap_add_irq_chip failed: %d\n", ret);
goto regmap_err;
+ }
- da9052->irq_base = regmap_irq_chip_get_base(da9052->irq_data);
+ da9052->irq = regmap_irq_get_virq(da9052->irq_data, 0);
- ret = request_threaded_irq(DA9052_IRQ_ADC_EOM, NULL, da9052_auxadc_irq,
+ if (da9052->irq < 0) {
+ ret = da9052->irq;
+ dev_err(da9052->dev, "regmap_irq_get_virq failed: %d\n", ret);
+ goto regmap_err;
+ }
+
+ ret = request_threaded_irq(da9052->irq + DA9052_IRQ_ADC_EOM, NULL,
+ da9052_auxadc_irq,
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
- "adc irq", da9052);
+ "adc-irq", da9052);
if (ret != 0)
dev_err(da9052->dev, "DA9052 ADC IRQ failed ret=%d\n", ret);
ret = mfd_add_devices(da9052->dev, -1, da9052_subdev_info,
ARRAY_SIZE(da9052_subdev_info), NULL, 0, NULL);
- if (ret)
+ if (ret) {
+ dev_err(da9052->dev, "mfd_add_devices failed: %d\n", ret);
goto err;
+ }
return 0;
err:
- free_irq(DA9052_IRQ_ADC_EOM, da9052);
+ free_irq(da9052->irq + DA9052_IRQ_ADC_EOM, da9052);
mfd_remove_devices(da9052->dev);
regmap_err:
return ret;
@@ -818,7 +824,7 @@ regmap_err:
void da9052_device_exit(struct da9052 *da9052)
{
- free_irq(DA9052_IRQ_ADC_EOM, da9052);
+ free_irq(da9052->irq + DA9052_IRQ_ADC_EOM, da9052);
regmap_del_irq_chip(da9052->chip_irq, da9052->irq_data);
mfd_remove_devices(da9052->dev);
}
diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h
index 0507c4c..f0b259d 100644
--- a/include/linux/mfd/da9052/da9052.h
+++ b/include/linux/mfd/da9052/da9052.h
@@ -99,6 +99,7 @@ struct da9052 {
u8 chip_id;
int chip_irq;
+ int irq;
};
/* ADC API */
next prev parent reply other threads:[~2012-09-28 14:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-28 1:57 [PATCH v2] mfd: da9052-core: Use regmap_irq_get_virq() and fix the probe Fabio Estevam
2012-09-28 6:42 ` Arnd Bergmann
2012-09-28 10:45 ` Fabio Estevam
2012-09-28 11:34 ` Arnd Bergmann
2012-09-28 10:52 ` Mark Brown
2012-09-28 11:35 ` Arnd Bergmann
2012-09-28 10:49 ` Mark Brown
2012-09-28 14:33 ` Fabio Estevam [this message]
2012-09-28 14:29 ` Mark Brown
2012-09-28 15:37 ` Fabio Estevam
2012-09-28 15:51 ` Mark Brown
2012-09-28 20:34 ` Fabio Estevam
2012-10-01 10:22 ` Mark Brown
2012-10-03 16:04 ` Fabio Estevam
2012-10-03 18:08 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5065B534.7040602@freescale.com \
--to=fabio.estevam@freescale.com \
--cc=arnd@arndb.de \
--cc=ashish.jangam@kpitcummins.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dchen@diasemi.com \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=marex@denx.de \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.