From: Sergei Shtylyov Date: Tue, 8 Jan 2013 19:13:40 +0000 (+0300) Subject: usb: musb: omap2430: kill redundant assignments in omap2430_probe() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8df4ce75189807783c4bb4e4337e0f89283e6ca3;p=openwrt%2Fstaging%2Fblogic.git usb: musb: omap2430: kill redundant assignments in omap2430_probe() Commit 00a0b1d58af873d842580dcac55f3b156c3a4077 (usb: musb: omap: Add device tree support for omap musb glue) added assignments of the 'ret' variable to -ENOMEM on *some* error paths of the calls to devm_kzalloc(), while that variable was already pre-initialized for to that value, so these assignments were completely redundant. Kill them, fixing overindented string, while at it. Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index c293dbeb8b24..cd06166affee 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -532,15 +532,13 @@ static int omap2430_probe(struct platform_device *pdev) if (!pdata) { dev_err(&pdev->dev, "failed to allocate musb platfrom data\n"); - ret = -ENOMEM; goto err2; } data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); if (!data) { dev_err(&pdev->dev, - "failed to allocate musb board data\n"); - ret = -ENOMEM; + "failed to allocate musb board data\n"); goto err2; }