From: Kefeng Wang <wangkefeng.wang@huawei.com>
Date: Wed, 5 Jun 2019 14:24:27 +0000 (+0800)
Subject: block: Drop unlikely before IS_ERR(_OR_NULL)
X-Git-Tag: v5.4-rc1~824^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98d669b49120bad6a09c361daa71c92e6a9f8fbb;p=platform%2Fkernel%2Flinux-rpi.git

block: Drop unlikely before IS_ERR(_OR_NULL)

IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag,
so no need to do that again from its callers. Drop it.

Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index b97b479..1f7127b 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -881,7 +881,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
 			blkg_free(new_blkg);
 		} else {
 			blkg = blkg_create(pos, q, new_blkg);
-			if (unlikely(IS_ERR(blkg))) {
+			if (IS_ERR(blkg)) {
 				ret = PTR_ERR(blkg);
 				goto fail_unlock;
 			}