mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
synced 2025-08-28 09:22:08 +00:00
usb: dwc3: omap: Use devm_regulator_get_optional()
The 'vbus-supply' regulator is optional, so use devm_regulator_get_optional() instead of checking for property presence first. While here, rework the error handling to use dev_err_probe() which handles deferred probe correctly without an error message. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Link: https://lore.kernel.org/r/20241231164456.262581-1-robh@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
dedab67442
commit
533561a8aa
@ -457,7 +457,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
|
||||
|
||||
struct dwc3_omap *omap;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct regulator *vbus_reg = NULL;
|
||||
struct regulator *vbus_reg;
|
||||
|
||||
int ret;
|
||||
int irq;
|
||||
@ -483,13 +483,9 @@ static int dwc3_omap_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(base))
|
||||
return PTR_ERR(base);
|
||||
|
||||
if (of_property_read_bool(node, "vbus-supply")) {
|
||||
vbus_reg = devm_regulator_get(dev, "vbus");
|
||||
if (IS_ERR(vbus_reg)) {
|
||||
dev_err(dev, "vbus init failed\n");
|
||||
return PTR_ERR(vbus_reg);
|
||||
}
|
||||
}
|
||||
vbus_reg = devm_regulator_get_optional(dev, "vbus");
|
||||
if (IS_ERR(vbus_reg))
|
||||
return dev_err_probe(dev, PTR_ERR(vbus_reg), "vbus init failed\n");
|
||||
|
||||
omap->dev = dev;
|
||||
omap->irq = irq;
|
||||
|
Loading…
Reference in New Issue
Block a user