OSDN Git Service

extcon: max77693: Use devm_extcon_dev_allocate for extcon_dev
authorChanwoo Choi <cw00.choi@samsung.com>
Mon, 21 Apr 2014 11:39:53 +0000 (20:39 +0900)
committerChanwoo Choi <cw00.choi@samsung.com>
Tue, 29 Apr 2014 00:50:07 +0000 (09:50 +0900)
This patch use devm_extcon_dev_allocate() to simplify the memory control
of extcon device.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
drivers/extcon/extcon-max77693.c

index f0f18e2..2c7c3e1 100644 (file)
@@ -1175,23 +1175,22 @@ static int max77693_muic_probe(struct platform_device *pdev)
        }
 
        /* Initialize extcon device */
-       info->edev = devm_kzalloc(&pdev->dev, sizeof(struct extcon_dev),
-                                 GFP_KERNEL);
-       if (!info->edev) {
+       info->edev = devm_extcon_dev_allocate(&pdev->dev,
+                                             max77693_extcon_cable);
+       if (IS_ERR(info->edev)) {
                dev_err(&pdev->dev, "failed to allocate memory for extcon\n");
                ret = -ENOMEM;
                goto err_irq;
        }
        info->edev->name = DEV_NAME;
        info->edev->dev.parent = &pdev->dev;
-       info->edev->supported_cable = max77693_extcon_cable;
+
        ret = devm_extcon_dev_register(&pdev->dev, info->edev);
        if (ret) {
                dev_err(&pdev->dev, "failed to register extcon device\n");
                goto err_irq;
        }
 
-
        /* Initialize MUIC register by using platform data or default data */
        if (pdata && pdata->muic_data) {
                init_data = pdata->muic_data->init_data;