mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: Jiri Kosina <trivial@kernel.org>, David Airlie <airlied@linux.ie>,
	dri-devel@lists.freedesktop.org
Subject: [PATCH 01/15] drm: Remove duplicate unlikely from IS_ERR
Date: Thu,  9 Dec 2010 12:03:54 -0800	[thread overview]
Message-ID: <0a4b327b21bdb6fed75c24cde8d51fef9ed2c031.1291923889.git.joe@perches.com> (raw)
In-Reply-To: <1291906801-1389-2-git-send-email-tklauser@distanz.ch>
In-Reply-To: <cover.1291923888.git.joe@perches.com>

IS_ERR already uses unlikely, remove unlikely from the call sites.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/gpu/drm/ttm/ttm_tt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index af789dc..fb83a90 100644
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -538,7 +538,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
 		swap_storage = shmem_file_setup("ttm swap",
 						ttm->num_pages << PAGE_SHIFT,
 						0);
-		if (unlikely(IS_ERR(swap_storage))) {
+		if (IS_ERR(swap_storage)) {
 			printk(KERN_ERR "Failed allocating swap storage.\n");
 			return PTR_ERR(swap_storage);
 		}
@@ -552,7 +552,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistant_swap_storage)
 		if (unlikely(from_page == NULL))
 			continue;
 		to_page = read_mapping_page(swap_space, i, NULL);
-		if (unlikely(IS_ERR(to_page))) {
+		if (IS_ERR(to_page)) {
 			ret = PTR_ERR(to_page);
 			goto out_err;
 		}
-- 
1.7.3.3.464.gf80b6


  reply	other threads:[~2010-12-09 20:04 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-09 15:00 [PATCH] c2port: Remove redundant unlikely() Tobias Klauser
2010-12-09 15:00 ` Tobias Klauser
2010-12-09 20:03   ` [trivial PATCH 00/15] remove duplicate unlikely from IS_ERR Joe Perches
2010-12-09 20:03     ` Joe Perches [this message]
2010-12-09 20:03     ` [PATCH 02/15] stmmac: Remove " Joe Perches
2010-12-09 20:03     ` [PATCH 03/15] rtc: " Joe Perches
2010-12-09 20:06       ` Mike Frysinger
2010-12-09 20:28         ` Joe Perches
2010-12-09 20:03     ` [PATCH 04/15] s390: " Joe Perches
2010-12-09 20:03     ` [PATCH 05/15] osd: " Joe Perches
2010-12-09 20:03     ` [PATCH 06/15] serial: " Joe Perches
2010-12-09 21:08       ` David Brown
2010-12-09 20:04     ` [PATCH 07/15] brcm80211: " Joe Perches
2010-12-09 20:04     ` [PATCH 08/15] gadget: " Joe Perches
2010-12-09 20:04     ` [PATCH 09/15] exofs: " Joe Perches
2010-12-09 20:04     ` [PATCH 10/15] ext2: " Joe Perches
2010-12-09 20:04     ` [PATCH 11/15] ext3: " Joe Perches
2010-12-09 20:04     ` [PATCH 12/15] ext4: " Joe Perches
2010-12-09 20:04     ` [PATCH 13/15] nfs: " Joe Perches
2010-12-09 20:04     ` [PATCH 14/15] mm: " Joe Perches
2010-12-09 20:04     ` [PATCH 15/15] ipv6: " Joe Perches
2010-12-09 20:32     ` [trivial PATCH 00/15] remove " Joe Perches

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=0a4b327b21bdb6fed75c24cde8d51fef9ed2c031.1291923889.git.joe@perches.com \
    --to=joe@perches.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=trivial@kernel.org \
    /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

all inboxes | Powered by JetHome®