Skip to content

Commit

Permalink
usb: dwc3: rtk: return directly and simplify with devm_platform_iorem…
Browse files Browse the repository at this point in the history
…ap_resource

Use devm_platform_ioremap_resource() wrapper instead of two calls, which
together with returning directly instead of useless goto, allows to
nicely simplify the probe() function.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/20240814-b4-cleanup-h-of-node-put-usb-v1-10-95481b9682bc@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
krzk authored and gregkh committed Sep 3, 2024
1 parent f93e96c commit 819c0c3
Showing 1 changed file with 8 additions and 25 deletions.
33 changes: 8 additions & 25 deletions drivers/usb/dwc3/dwc3-rtk.c
Original file line number Diff line number Diff line change
Expand Up @@ -358,47 +358,30 @@ static int dwc3_rtk_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct resource *res;
void __iomem *regs;
int ret = 0;

rtk = devm_kzalloc(dev, sizeof(*rtk), GFP_KERNEL);
if (!rtk) {
ret = -ENOMEM;
goto out;
}
if (!rtk)
return -ENOMEM;

platform_set_drvdata(pdev, rtk);

rtk->dev = dev;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(dev, "missing memory resource\n");
ret = -ENODEV;
goto out;
}

regs = devm_ioremap_resource(dev, res);
if (IS_ERR(regs)) {
ret = PTR_ERR(regs);
goto out;
}
regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(regs))
return PTR_ERR(regs);

rtk->regs = regs;
rtk->regs_size = resource_size(res);

res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (res) {
rtk->pm_base = devm_ioremap_resource(dev, res);
if (IS_ERR(rtk->pm_base)) {
ret = PTR_ERR(rtk->pm_base);
goto out;
}
if (IS_ERR(rtk->pm_base))
return PTR_ERR(rtk->pm_base);
}

ret = dwc3_rtk_probe_dwc3_core(rtk);

out:
return ret;
return dwc3_rtk_probe_dwc3_core(rtk);
}

static void dwc3_rtk_remove(struct platform_device *pdev)
Expand Down

0 comments on commit 819c0c3

Please sign in to comment.