From: Yang Zhang <kthreadd@gmail.com>
Date: Fri, 17 Dec 2010 07:58:36 +0000 (+0100)
Subject: block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p)
X-Git-Tag: firefly_0821_release~7613^2~2877^2~14
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b9f985b6e05ebd7af2aaef0eb3ae369390ef191f;p=firefly-linux-kernel-4.4.55.git

block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p)

Signed-off-by: Yang Zhang <kthreadd@gmail.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/block/genhd.c b/block/genhd.c
index 5fa2b44a72ff..79b9e327f3cb 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -735,7 +735,7 @@ static void *show_partition_start(struct seq_file *seqf, loff_t *pos)
 	static void *p;
 
 	p = disk_seqf_start(seqf, pos);
-	if (!IS_ERR(p) && p && !*pos)
+	if (!IS_ERR_OR_NULL(p) && !*pos)
 		seq_puts(seqf, "major minor  #blocks  name\n\n");
 	return p;
 }