From: Felipe Balbi <balbi@ti.com>
Date: Tue, 26 Feb 2013 13:25:41 +0000 (+0200)
Subject: usb: gadget: udc-core: remove protection when setting gadget.dev.release
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ddf47ccbfebc12add813cf729ecfc2d5ab59ca19;p=deliverable%2Flinux.git

usb: gadget: udc-core: remove protection when setting gadget.dev.release

now that no UDC driver touches gadget.dev.release
we can assign our release function to it without
being afraid of breaking anything.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index a50811e35bdb..26e116bd6f59 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -198,12 +198,10 @@ int usb_add_gadget_udc_release(struct device *parent, struct usb_gadget *gadget,
 	gadget->dev.dma_parms = parent->dma_parms;
 	gadget->dev.dma_mask = parent->dma_mask;
 
-	if (release) {
+	if (release)
 		gadget->dev.release = release;
-	} else {
-		if (!gadget->dev.release)
-			gadget->dev.release = usb_udc_nop_release;
-	}
+	else
+		gadget->dev.release = usb_udc_nop_release;
 
 	ret = device_register(&gadget->dev);
 	if (ret)