]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
extcon: max14577: Use devm_extcon_dev_register()
authorSangjung Woo <sangjung.woo@samsung.com>
Mon, 21 Apr 2014 10:10:11 +0000 (19:10 +0900)
committerChanwoo Choi <cw00.choi@samsung.com>
Thu, 24 Apr 2014 10:37:04 +0000 (19:37 +0900)
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>
drivers/extcon/extcon-max14577.c

index 2acf7461c905ef420c0b2613e9085c343cd911e7..d17dd4ff4d0f71221738c5883943dd0c41f838b9 100644 (file)
@@ -747,7 +747,7 @@ static int max14577_muic_probe(struct platform_device *pdev)
 
        info->edev->name = dev_name(&pdev->dev);
        info->edev->supported_cable = max14577_extcon_cable;
-       ret = extcon_dev_register(info->edev);
+       ret = devm_extcon_dev_register(&pdev->dev, info->edev);
        if (ret) {
                dev_err(&pdev->dev, "failed to register extcon device\n");
                return ret;
@@ -766,7 +766,7 @@ static int max14577_muic_probe(struct platform_device *pdev)
                        MAX14577_REG_DEVICEID, &id);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to read revision number\n");
-               goto err_extcon;
+               return ret;
        }
        dev_info(info->dev, "device ID : 0x%x\n", id);
 
@@ -786,10 +786,6 @@ static int max14577_muic_probe(struct platform_device *pdev)
                        delay_jiffies);
 
        return ret;
-
-err_extcon:
-       extcon_dev_unregister(info->edev);
-       return ret;
 }
 
 static int max14577_muic_remove(struct platform_device *pdev)
@@ -797,7 +793,6 @@ static int max14577_muic_remove(struct platform_device *pdev)
        struct max14577_muic_info *info = platform_get_drvdata(pdev);
 
        cancel_work_sync(&info->irq_work);
-       extcon_dev_unregister(info->edev);
 
        return 0;
 }