usb: otg: twl: use devres API to allocate resources

used devres API while allocating memory resource in twl4030 and twl6030
so that these resources are released automatically on driver detach.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index 4d0d98bc40cdf70a8104650012414fe2c29eb711..523cad5bfea947deca4d288a338cc3acc4c9c3a1 100644 (file)
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -591,15 +591,13 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       twl = kzalloc(sizeof *twl, GFP_KERNEL);
+       twl = devm_kzalloc(&pdev->dev, sizeof *twl, GFP_KERNEL);
        if (!twl)
                return -ENOMEM;
 
-       otg = kzalloc(sizeof *otg, GFP_KERNEL);
-       if (!otg) {
-               kfree(twl);
+       otg = devm_kzalloc(&pdev->dev, sizeof *otg, GFP_KERNEL);
+       if (!otg)
                return -ENOMEM;
-       }
 
        twl->dev                = &pdev->dev;
        twl->irq                = platform_get_irq(pdev, 0);
@@ -623,8 +621,6 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
        err = twl4030_usb_ldo_init(twl);
        if (err) {
                dev_err(&pdev->dev, "ldo init failed\n");
-               kfree(otg);
-               kfree(twl);
                return err;
        }
        usb_add_phy(&twl->phy, USB_PHY_TYPE_USB2);
@@ -648,8 +644,6 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
        if (status < 0) {
                dev_dbg(&pdev->dev, "can't get IRQ %d, err %d\n",
                        twl->irq, status);
-               kfree(otg);
-               kfree(twl);
                return status;
        }
 
@@ -693,9 +687,6 @@ static int __exit twl4030_usb_remove(struct platform_device *pdev)
        regulator_put(twl->usb1v8);
        regulator_put(twl->usb3v1);
 
-       kfree(twl->phy.otg);
-       kfree(twl);
-
        return 0;
 }
 

diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index 66cfea735557839319a18934186674d9eddc13db..600c27a42ff146544186bea89b9c4e917cd0f17d 100644 (file)
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -395,15 +395,13 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        pdata = dev->platform_data;
 
-       twl = kzalloc(sizeof *twl, GFP_KERNEL);
+       twl = devm_kzalloc(dev, sizeof *twl, GFP_KERNEL);
        if (!twl)
                return -ENOMEM;
 
-       otg = kzalloc(sizeof *otg, GFP_KERNEL);
-       if (!otg) {
-               kfree(twl);
+       otg = devm_kzalloc(dev, sizeof *otg, GFP_KERNEL);
+       if (!otg)
                return -ENOMEM;
-       }
 
        twl->dev                = &pdev->dev;
        twl->irq1               = platform_get_irq(pdev, 0);
@@ -430,8 +428,6 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
        err = twl6030_usb_ldo_init(twl);
        if (err) {
                dev_err(&pdev->dev, "ldo init failed\n");
-               kfree(otg);
-               kfree(twl);
                return err;
        }
        usb_add_phy(&twl->phy, USB_PHY_TYPE_USB2);
@@ -450,8 +446,6 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
                        twl->irq1, status);
                device_remove_file(twl->dev, &dev_attr_vbus);
-               kfree(otg);
-               kfree(twl);
                return status;
        }
 
@@ -463,8 +457,6 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
                        twl->irq2, status);
                free_irq(twl->irq1, twl);
                device_remove_file(twl->dev, &dev_attr_vbus);
-               kfree(otg);
-               kfree(twl);
                return status;
        }
 
@@ -495,8 +487,6 @@ static int __exit twl6030_usb_remove(struct platform_device *pdev)
        pdata->phy_exit(twl->dev);
        device_remove_file(twl->dev, &dev_attr_vbus);
        cancel_work_sync(&twl->set_vbus_work);
-       kfree(twl->phy.otg);
-       kfree(twl);
 
        return 0;
 }