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

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

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;
 }