Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9166902c authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Felipe Balbi
Browse files

usb: phy: twl4030: use devres API for regulator get and request irq 



Used devres APIs devm_request_threaded_irq and devm_regulator_get for
requesting irq and for getting regulator respectively.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Tested-by: default avatarGrazvydas Ignotas <notasas@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent b7fa5c2a

drivers/usb/phy/phy-twl4030-usb.c

+8 −20
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int twl4030_usb_ldo_init(struct twl4030_usb *twl) 
	/* Initialize 3.1V regulator */

	twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0, VUSB3V1_DEV_GRP);



	twl->usb3v1 = regulator_get(twl->dev, "usb3v1");

	twl->usb3v1 = devm_regulator_get(twl->dev, "usb3v1");

	if (IS_ERR(twl->usb3v1))

		return -ENODEV;
@@ -441,18 +441,18 @@ static int twl4030_usb_ldo_init(struct twl4030_usb *twl) 
	/* Initialize 1.5V regulator */

	twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0, VUSB1V5_DEV_GRP);



	twl->usb1v5 = regulator_get(twl->dev, "usb1v5");

	twl->usb1v5 = devm_regulator_get(twl->dev, "usb1v5");

	if (IS_ERR(twl->usb1v5))

		goto fail1;

		return -ENODEV;



	twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0, VUSB1V5_TYPE);



	/* Initialize 1.8V regulator */

	twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0, VUSB1V8_DEV_GRP);



	twl->usb1v8 = regulator_get(twl->dev, "usb1v8");

	twl->usb1v8 = devm_regulator_get(twl->dev, "usb1v8");

	if (IS_ERR(twl->usb1v8))

		goto fail2;

		return -ENODEV;



	twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0, VUSB1V8_TYPE);
@@ -461,14 +461,6 @@ static int twl4030_usb_ldo_init(struct twl4030_usb *twl) 
			 TWL4030_PM_MASTER_PROTECT_KEY);



	return 0;



fail2:

	regulator_put(twl->usb1v5);

	twl->usb1v5 = NULL;

fail1:

	regulator_put(twl->usb3v1);

	twl->usb3v1 = NULL;

	return -ENODEV;

}



static ssize_t twl4030_usb_vbus_show(struct device *dev,
@@ -640,9 +632,9 @@ static int twl4030_usb_probe(struct platform_device *pdev) 
	 * need both handles, otherwise just one suffices.

	 */

	twl->irq_enabled = true;

	status = request_threaded_irq(twl->irq, NULL, twl4030_usb_irq,

			IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING |

			IRQF_ONESHOT, "twl4030_usb", twl);

	status = devm_request_threaded_irq(twl->dev, twl->irq, NULL,

			twl4030_usb_irq, IRQF_TRIGGER_FALLING |

			IRQF_TRIGGER_RISING | IRQF_ONESHOT, "twl4030_usb", twl);

	if (status < 0) {

		dev_dbg(&pdev->dev, "can't get IRQ %d, err %d\n",

			twl->irq, status);
@@ -663,7 +655,6 @@ static int __exit twl4030_usb_remove(struct platform_device *pdev) 
	struct twl4030_usb *twl = platform_get_drvdata(pdev);

	int val;



	free_irq(twl->irq, twl);

	device_remove_file(twl->dev, &dev_attr_vbus);



	/* set transceiver mode to power on defaults */
@@ -685,9 +676,6 @@ static int __exit twl4030_usb_remove(struct platform_device *pdev) 


	if (!twl->asleep)

		twl4030_phy_power(twl, 0);

	regulator_put(twl->usb1v5);

	regulator_put(twl->usb1v8);

	regulator_put(twl->usb3v1);



	return 0;

}