diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-21 08:25:56 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-05-09 08:27:38 -0400 |
commit | 3dc6f4aaafbe9e745fd1183b7a7a91aeeae99fcd (patch) | |
tree | a5d098ba2814d47d522bd2ce419fac0420357466 /drivers/mfd/sec-irq.c | |
parent | b36c82724fa10da7cc73693c6c2c3ab9a6c8034b (diff) |
mfd: sec: Use devm_mfd_add_devices and devm_regmap_add_irq_chip
Use devm_mfd_add_devices() for adding MFD child devices and
devm_regmap_add_irq_chip() for IRQ chip registration.
This reduces the error code path and .remove callback for removing
MFD child devices and deleting IRQ chip data.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/sec-irq.c')
-rw-r--r-- | drivers/mfd/sec-irq.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c index d77de431cc50..5eb59c233d52 100644 --- a/drivers/mfd/sec-irq.c +++ b/drivers/mfd/sec-irq.c | |||
@@ -483,10 +483,11 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) | |||
483 | return -EINVAL; | 483 | return -EINVAL; |
484 | } | 484 | } |
485 | 485 | ||
486 | ret = regmap_add_irq_chip(sec_pmic->regmap_pmic, sec_pmic->irq, | 486 | ret = devm_regmap_add_irq_chip(sec_pmic->dev, sec_pmic->regmap_pmic, |
487 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, | 487 | sec_pmic->irq, |
488 | sec_pmic->irq_base, sec_irq_chip, | 488 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, |
489 | &sec_pmic->irq_data); | 489 | sec_pmic->irq_base, sec_irq_chip, |
490 | &sec_pmic->irq_data); | ||
490 | if (ret != 0) { | 491 | if (ret != 0) { |
491 | dev_err(sec_pmic->dev, "Failed to register IRQ chip: %d\n", ret); | 492 | dev_err(sec_pmic->dev, "Failed to register IRQ chip: %d\n", ret); |
492 | return ret; | 493 | return ret; |
@@ -500,8 +501,3 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) | |||
500 | 501 | ||
501 | return 0; | 502 | return 0; |
502 | } | 503 | } |
503 | |||
504 | void sec_irq_exit(struct sec_pmic_dev *sec_pmic) | ||
505 | { | ||
506 | regmap_del_irq_chip(sec_pmic->irq, sec_pmic->irq_data); | ||
507 | } | ||