summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorAdam Thomson <Adam.Thomson.Opensource@diasemi.com>2014-02-06 18:03:17 +0000
committerGuenter Roeck <linux@roeck-us.net>2014-02-06 17:22:33 -0800
commit4f545a4ba158600b7a780b9daaf9ffabb934cdb6 (patch)
tree0a637975e2cae6776f8bb74fb4d412c352840238 /drivers/hwmon
parentdaa436e67cd2dcac7cbb505bb4425fdfdafaa5a7 (diff)
downloadlinux-4f545a4ba158600b7a780b9daaf9ffabb934cdb6.tar.gz
linux-4f545a4ba158600b7a780b9daaf9ffabb934cdb6.tar.bz2
linux-4f545a4ba158600b7a780b9daaf9ffabb934cdb6.zip
hwmon: (da9055) Remove use of regmap_irq_get_virq()
Remove use of regmap_irq_get_virq() in driver probe which was conflicting with use of platform_get_irq_byname(). platform_get_irq_byname() already returns the VIRQ number due to MFD core translation so using regmap_irq_get_virq() on that returned value results in an incorrect IRQ being requested. The driver probes then fail because of this. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/da9055-hwmon.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/hwmon/da9055-hwmon.c b/drivers/hwmon/da9055-hwmon.c
index 029ecabc4380..73b3865f1207 100644
--- a/drivers/hwmon/da9055-hwmon.c
+++ b/drivers/hwmon/da9055-hwmon.c
@@ -278,10 +278,6 @@ static int da9055_hwmon_probe(struct platform_device *pdev)
if (hwmon_irq < 0)
return hwmon_irq;
- hwmon_irq = regmap_irq_get_virq(hwmon->da9055->irq_data, hwmon_irq);
- if (hwmon_irq < 0)
- return hwmon_irq;
-
ret = devm_request_threaded_irq(&pdev->dev, hwmon_irq,
NULL, da9055_auxadc_irq,
IRQF_TRIGGER_HIGH | IRQF_ONESHOT,