diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-07 12:14:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-07 12:14:24 -0800 |
| commit | 2091f4358fb20a7403ff35772f52026c8d7730c6 (patch) | |
| tree | ce392d829450d0c3d751dcd9ec6e90178954827a /drivers/hwmon/da9055-hwmon.c | |
| parent | Merge tag 'pm+acpi-3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | hwmon: (da9055) Remove use of regmap_irq_get_virq() (diff) | |
| download | linux-dev-2091f4358fb20a7403ff35772f52026c8d7730c6.tar.xz linux-dev-2091f4358fb20a7403ff35772f52026c8d7730c6.zip | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Fix PMBus driver problem with some multi-page voltage sensors and fix
da9055 interrupt initialization"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (da9055) Remove use of regmap_irq_get_virq()
hwmon: (pmbus) Support per-page exponent in linear mode
Diffstat (limited to 'drivers/hwmon/da9055-hwmon.c')
| -rw-r--r-- | drivers/hwmon/da9055-hwmon.c | 4 |
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, |