diff options
author | Hirofumi Nakagawa <hnakagawa@miraclelinux.com> | 2008-04-29 04:03:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:25 -0400 |
commit | 801678c5a3b4c79236970bcca27c733f5559e0d1 (patch) | |
tree | 5ad4761f539525077895f261b64fccda4d1303c4 /drivers/block | |
parent | 9a6f70bbed4e8b72dd340812d7c606bfd5e00b47 (diff) |
Remove duplicated unlikely() in IS_ERR()
Some drivers have duplicated unlikely() macros. IS_ERR() already has
unlikely() in itself.
This patch cleans up such pointless code.
Signed-off-by: Hirofumi Nakagawa <hnakagawa@miraclelinux.com>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Jeff Garzik <jeff@garzik.org>
Cc: Paul Clements <paul.clements@steeleye.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: Anton Altaparmakov <aia21@cantab.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Carsten Otte <cotte@de.ibm.com>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/nbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index a3da198ca429..bdba282f15e4 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
@@ -339,7 +339,7 @@ static struct request *nbd_read_stat(struct nbd_device *lo) | |||
339 | } | 339 | } |
340 | 340 | ||
341 | req = nbd_find_request(lo, *(struct request **)reply.handle); | 341 | req = nbd_find_request(lo, *(struct request **)reply.handle); |
342 | if (unlikely(IS_ERR(req))) { | 342 | if (IS_ERR(req)) { |
343 | result = PTR_ERR(req); | 343 | result = PTR_ERR(req); |
344 | if (result != -ENOENT) | 344 | if (result != -ENOENT) |
345 | goto harderror; | 345 | goto harderror; |