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 5fa2b44a72ffd22994d2e648b3d247f3f4877c95..79b9e327f3cb97b8ebc22e70f3e70aaf22e0ce43 100644 (file)
--- 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;
 }