<div dir="ltr">On Sat, Mar 15, 2014 at 10:12 PM, Arthur Borsboom <span dir="ltr"><<a href="mailto:arthurborsboom@gmail.com" target="_blank">arthurborsboom@gmail.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Removed centralized exiting of function (goto statement), since it was<br>
the only used in one single location with only a return statement.<br>
<br>
Signed-off-by: Arthur Borsboom <<a href="mailto:arthurborsboom@gmail.com">arthurborsboom@gmail.com</a>><br>
---<br>
drivers/gpu/drm/gma500/psb_drv.c | 7 +------<br>
1 file changed, 1 insertion(+), 6 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c<br>
index 1199180..a10db3d 100644<br>
--- a/drivers/gpu/drm/gma500/psb_drv.c<br>
+++ b/drivers/gpu/drm/gma500/psb_drv.c<br>
@@ -169,12 +169,9 @@ static int psb_do_init(struct drm_device *dev)<br>
<br>
uint32_t stolen_gtt;<br>
<br>
- int ret = -ENOMEM;<br>
-<br>
if (pg->mmu_gatt_start & 0x0FFFFFFF) {<br>
dev_err(dev->dev, "Gatt must be 256M aligned. This is a bug.\n");<br>
- ret = -EINVAL;<br>
- goto out_err;<br>
+ return -EINVAL;<br>
}<br>
<br>
<br>
@@ -199,8 +196,6 @@ static int psb_do_init(struct drm_device *dev)<br>
/* mmu_gatt ?? */<br>
PSB_WSGX32(pg->gatt_start, PSB_CR_BIF_TWOD_REQ_BASE);<br>
return 0;<br>
-out_err:<br>
- return ret;<br>
}<br>
<br>
static int psb_driver_unload(struct drm_device *dev)<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.9.0<br>
<br>
</font></span></blockquote></div><br></div><div class="gmail_extra">These three patches are now merged and ready for 3.15-rc1<br><br></div><div class="gmail_extra">Thanks<br></div><div class="gmail_extra">Patrik<br></div>
</div>