diff options
| author | Chanwoo Choi <cw00.choi@samsung.com> | 2014-04-21 13:37:51 +0200 |
|---|---|---|
| committer | Chanwoo Choi <cw00.choi@samsung.com> | 2014-04-29 02:46:28 +0200 |
| commit | 22f9afb95ba67eb6839e2b5499f5f42a767b1c18 (patch) | |
| tree | 78b688c97d20fda37d38d6149e84a9e628432bf7 /drivers/extcon | |
| parent | extcon: Add devm_extcon_dev_allocate/free to manage the resource of extcon de... (diff) | |
| download | linux-22f9afb95ba67eb6839e2b5499f5f42a767b1c18.tar.xz linux-22f9afb95ba67eb6839e2b5499f5f42a767b1c18.zip | |
extcon: max8997: Use devm_extcon_dev_allocate for extcon_dev
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>
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon-max8997.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c index 804a446fecdc..d9f7f1baaa03 100644 --- a/drivers/extcon/extcon-max8997.c +++ b/drivers/extcon/extcon-max8997.c @@ -699,16 +699,15 @@ static int max8997_muic_probe(struct platform_device *pdev) } /* External connector */ - info->edev = devm_kzalloc(&pdev->dev, sizeof(struct extcon_dev), - GFP_KERNEL); - if (!info->edev) { + info->edev = devm_extcon_dev_allocate(&pdev->dev, max8997_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 = max8997_extcon_cable; + ret = devm_extcon_dev_register(&pdev->dev, info->edev); if (ret) { dev_err(&pdev->dev, "failed to register extcon device\n"); |