aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSangjung Woo <sangjung.woo@samsung.com>2014-04-21 06:10:13 -0400
committerChanwoo Choi <cw00.choi@samsung.com>2014-04-24 06:37:05 -0400
commit2923803d4f69fd8e4ed85786b8888986b2682154 (patch)
tree597b5183a034da5aa4adbb8cd13086a2488abf92
parent10fae1184d00f09696078e572230402543ae34c8 (diff)
extcon: max8997: Use devm_extcon_dev_register()
Use the resource-managed extcon device register function (i.e. devm_extcon_dev_register()) instead of extcon_dev_register(). If extcon device is attached with this function, that extcon device is automatically unregistered on driver detach. That reduces tiresome managing code. Signed-off-by: Sangjung Woo <sangjung.woo@samsung.com> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
-rw-r--r--drivers/extcon/extcon-max8997.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 223e6b068c98..804a446fecdc 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -709,7 +709,7 @@ static int max8997_muic_probe(struct platform_device *pdev)
709 info->edev->name = DEV_NAME; 709 info->edev->name = DEV_NAME;
710 info->edev->dev.parent = &pdev->dev; 710 info->edev->dev.parent = &pdev->dev;
711 info->edev->supported_cable = max8997_extcon_cable; 711 info->edev->supported_cable = max8997_extcon_cable;
712 ret = extcon_dev_register(info->edev); 712 ret = devm_extcon_dev_register(&pdev->dev, info->edev);
713 if (ret) { 713 if (ret) {
714 dev_err(&pdev->dev, "failed to register extcon device\n"); 714 dev_err(&pdev->dev, "failed to register extcon device\n");
715 goto err_irq; 715 goto err_irq;
@@ -790,8 +790,6 @@ static int max8997_muic_remove(struct platform_device *pdev)
790 free_irq(muic_irqs[i].virq, info); 790 free_irq(muic_irqs[i].virq, info);
791 cancel_work_sync(&info->irq_work); 791 cancel_work_sync(&info->irq_work);
792 792
793 extcon_dev_unregister(info->edev);
794
795 return 0; 793 return 0;
796} 794}
797 795