From: YAMANE Toshiaki <yamanetoshi@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Rob Clark <rob@ti.com>
Cc: Dave Airlie <airlied@redhat.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
YAMANE Toshiaki <yamanetoshi@gmail.com>
Subject: [PATCH 10/16] staging/omapdrm: Fix spacing coding style in omap_gem.c
Date: Wed, 14 Nov 2012 19:33:17 +0900 [thread overview]
Message-ID: <1352889197-15168-1-git-send-email-yamanetoshi@gmail.com> (raw)
In-Reply-To: <1352888935-14742-1-git-send-email-yamanetoshi@gmail.com>
The following warnings fixed.
- WARNING: braces {} are not necessary for single statement blocks
Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
---
drivers/staging/omapdrm/omap_gem.c | 38 ++++++++++++++----------------------
1 file changed, 15 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/omapdrm/omap_gem.c b/drivers/staging/omapdrm/omap_gem.c
index 94c04a5..e615871 100644
--- a/drivers/staging/omapdrm/omap_gem.c
+++ b/drivers/staging/omapdrm/omap_gem.c
@@ -521,9 +521,8 @@ int omap_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
/* if a shmem backed object, make sure we have pages attached now */
ret = get_pages(obj, &pages);
- if (ret) {
+ if (ret)
goto fail;
- }
/* where should we do corresponding put_pages().. we are mapping
* the original page, rather than thru a GART, so we can't rely
@@ -1146,9 +1145,8 @@ int omap_gem_op_sync(struct drm_gem_object *obj, enum omap_gem_op op)
struct omap_gem_sync_waiter *waiter =
kzalloc(sizeof(*waiter), GFP_KERNEL);
- if (!waiter) {
+ if (!waiter)
return -ENOMEM;
- }
waiter->omap_obj = omap_obj;
waiter->op = op;
@@ -1177,9 +1175,8 @@ int omap_gem_op_sync(struct drm_gem_object *obj, enum omap_gem_op op)
}
spin_unlock(&sync_lock);
- if (waiter) {
+ if (waiter)
kfree(waiter);
- }
}
return ret;
}
@@ -1201,9 +1198,8 @@ int omap_gem_op_async(struct drm_gem_object *obj, enum omap_gem_op op,
struct omap_gem_sync_waiter *waiter =
kzalloc(sizeof(*waiter), GFP_ATOMIC);
- if (!waiter) {
+ if (!waiter)
return -ENOMEM;
- }
waiter->omap_obj = omap_obj;
waiter->op = op;
@@ -1285,9 +1281,8 @@ void omap_gem_free_object(struct drm_gem_object *obj)
list_del(&omap_obj->mm_list);
- if (obj->map_list.map) {
+ if (obj->map_list.map)
drm_gem_free_mmap_offset(obj);
- }
/* this means the object is still pinned.. which really should
* not happen. I think..
@@ -1296,9 +1291,9 @@ void omap_gem_free_object(struct drm_gem_object *obj)
/* don't free externally allocated backing memory */
if (!(omap_obj->flags & OMAP_BO_EXT_MEM)) {
- if (omap_obj->pages) {
+ if (omap_obj->pages)
omap_gem_detach_pages(obj);
- }
+
if (!is_shmem(obj)) {
dma_free_writecombine(dev->dev, obj->size,
omap_obj->vaddr, omap_obj->paddr);
@@ -1308,9 +1303,8 @@ void omap_gem_free_object(struct drm_gem_object *obj)
}
/* don't free externally allocated syncobj */
- if (!(omap_obj->flags & OMAP_BO_EXT_SYNC)) {
+ if (!(omap_obj->flags & OMAP_BO_EXT_SYNC))
kfree(omap_obj->sync);
- }
drm_gem_object_release(obj);
@@ -1395,9 +1389,9 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
*/
omap_obj->vaddr = dma_alloc_writecombine(dev->dev, size,
&omap_obj->paddr, GFP_KERNEL);
- if (omap_obj->vaddr) {
+ if (omap_obj->vaddr)
flags |= OMAP_BO_DMA;
- }
+
}
omap_obj->flags = flags;
@@ -1407,22 +1401,20 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
omap_obj->height = gsize.tiled.height;
}
- if (flags & (OMAP_BO_DMA|OMAP_BO_EXT_MEM)) {
+ if (flags & (OMAP_BO_DMA|OMAP_BO_EXT_MEM))
ret = drm_gem_private_object_init(dev, obj, size);
- } else {
+ else
ret = drm_gem_object_init(dev, obj, size);
- }
- if (ret) {
+ if (ret)
goto fail;
- }
return obj;
fail:
- if (obj) {
+ if (obj)
omap_gem_free_object(obj);
- }
+
return NULL;
}
--
1.7.9.5
next prev parent reply other threads:[~2012-11-14 10:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 10:28 [PATCH 01/16] staging/omapdrm: Fix spacing coding style in omap_connector.c YAMANE Toshiaki
2012-11-14 10:30 ` [PATCH 02/16] staging/omapdrm: remove the unnecessary initialization of a local variable in omap_crtc.c YAMANE Toshiaki
2012-11-14 10:30 ` [PATCH 03/16] staging/omapdrm: Fix spacing coding style " YAMANE Toshiaki
2012-11-14 10:30 ` [PATCH 04/16] staging/omapdrm: Fix spacing coding style in omap_drv.c YAMANE Toshiaki
2012-11-14 10:30 ` [PATCH 05/16] staging/omapdrm: Fix spacing coding style in omap_drv.h YAMANE Toshiaki
2012-11-14 10:31 ` [PATCH 06/16] " YAMANE Toshiaki
2012-11-14 10:31 ` [PATCH 07/16] staging/omapdrm: Fix spacing coding style in omap_encoder.c YAMANE Toshiaki
2012-11-14 10:32 ` [PATCH 08/16] staging/omapdrm: Fix spacing coding style in omap_fb.c YAMANE Toshiaki
2012-11-14 10:32 ` [PATCH 09/16] staging/omapdrm: Fix spacing coding style in omap_gem.c YAMANE Toshiaki
2012-11-14 10:33 ` YAMANE Toshiaki [this message]
2012-11-14 10:33 ` [PATCH 11/16] " YAMANE Toshiaki
2012-11-14 10:40 ` [PATCH 12/16] staging/omapdrm: Fix spacing coding style in omap_gem_dmabuf.c YAMANE Toshiaki
2012-11-14 10:40 ` [PATCH 13/16] staging/omapdrm: Fix spacing coding style in omap_gem_helper.c YAMANE Toshiaki
2012-11-14 10:40 ` [PATCH 14/16] " YAMANE Toshiaki
2012-11-14 10:40 ` [PATCH 15/16] staging/omapdrm: Fix spacing coding style in omap_plane.c YAMANE Toshiaki
2012-11-14 10:41 ` [PATCH 16/16] " YAMANE Toshiaki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352889197-15168-1-git-send-email-yamanetoshi@gmail.com \
--to=yamanetoshi@gmail.com \
--cc=airlied@redhat.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rob@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).