public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: musb: omap2430: clean up probe error handling

Browse source 
Using numbered error labels is discouraged (e.g. as it requires
renumbering them when adding a new intermediate error path).

Rename the error labels after what they do.

While at it, drop the redundant platform allocation failure dev_err()
as the error would already have been logged by the allocator.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20250724091910.21092-6-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2025-07-24 11:19:10 +02:00 • committed by Greg Kroah-Hartman
parent 1473e9e767
commit 51d4b0a44c
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/usb/musb/omap2430.c
View file

@ -318,13 +318,11 @@ static int omap2430_probe(struct platform_device *pdev)
glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL); glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
if (!glue) if (!glue)
goto err0; return -ENOMEM;
musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO); musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO);
if (!musb) { if (!musb)
dev_err(&pdev->dev, "failed to allocate musb device\n"); return -ENOMEM;
goto err0;
}
musb->dev.parent = &pdev->dev; musb->dev.parent = &pdev->dev;
musb->dev.dma_mask = &omap2430_dmamask; musb->dev.dma_mask = &omap2430_dmamask;
@ -349,15 +347,15 @@ static int omap2430_probe(struct platform_device *pdev)
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) if (!pdata)
goto err2; goto err_put_musb;
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
if (!data) if (!data)
goto err2; goto err_put_musb;
config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL); config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL);
if (!config) if (!config)
goto err2; goto err_put_musb;
of_property_read_u32(np, "mode", (u32 *)&pdata->mode); of_property_read_u32(np, "mode", (u32 *)&pdata->mode);
of_property_read_u32(np, "interface-type", of_property_read_u32(np, "interface-type",
@ -380,7 +378,7 @@ static int omap2430_probe(struct platform_device *pdev)
if (!control_pdev) { if (!control_pdev) {
dev_err(&pdev->dev, "Failed to get control device\n"); dev_err(&pdev->dev, "Failed to get control device\n");
ret = -EINVAL; ret = -EINVAL;
goto err2; goto err_put_musb;
} }
glue->control_otghs = &control_pdev->dev; glue->control_otghs = &control_pdev->dev;
} }
@ -456,20 +454,19 @@ static int omap2430_probe(struct platform_device *pdev)
ret = platform_device_add(musb); ret = platform_device_add(musb);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register musb device\n"); dev_err(&pdev->dev, "failed to register musb device\n");
goto err3; goto err_disable_rpm;
} }
return 0; return 0;
err3: err_disable_rpm:
pm_runtime_disable(glue->dev); pm_runtime_disable(glue->dev);
err_put_control_otghs: err_put_control_otghs:
if (!IS_ERR(glue->control_otghs)) if (!IS_ERR(glue->control_otghs))
put_device(glue->control_otghs); put_device(glue->control_otghs);
err2: err_put_musb:
platform_device_put(musb); platform_device_put(musb);
err0:
return ret; return ret;
} }