linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 5/8] r8a66597-udc: cleanup error path
@ 2014-06-17 15:14 Ben Dooks
  0 siblings, 0 replies; only message in thread
From: Ben Dooks @ 2014-06-17 15:14 UTC (permalink / raw)
  To: linux-sh

With the updates for devm, the cleanup path no longer needs to
check for NULL device state, so remove it and return directly
if the irq resource missing

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
 drivers/usb/gadget/r8a66597-udc.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index 2662853..9ebe2c0 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1878,9 +1878,8 @@ static int __init r8a66597_probe(struct platform_device *pdev)
 	irq_trigger = ires->flags & IRQF_TRIGGER_MASK;
 
 	if (irq < 0) {
-		ret = -ENODEV;
 		dev_err(dev, "platform_get_irq error.\n");
-		goto clean_up;
+		return -ENODEV;
 	}
 
 	/* initialize ucd */
@@ -1979,11 +1978,8 @@ clean_up2:
 		clk_put(r8a66597->clk);
 	}
 clean_up:
-	if (r8a66597) {
-		if (r8a66597->ep0_req)
-			r8a66597_free_request(&r8a66597->ep[0].ep,
-						r8a66597->ep0_req);
-	}
+	if (r8a66597->ep0_req)
+		r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
 
 	return ret;
 }
-- 
2.0.0


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2014-06-17 15:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-17 15:14 [PATCH 5/8] r8a66597-udc: cleanup error path Ben Dooks

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).