From: Alberto Bertogli <albertito@blitiri.com.ar>
Date: Thu, 2 Oct 2008 10:46:53 +0000 (+0200)
Subject: bio.h: Remove unused conditional code
X-Git-Tag: v3.12-rc1~18239^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8deaf7210728c453295dc1cb2a5b66c68183ac85;p=kernel%2Fkernel-generic.git

bio.h: Remove unused conditional code

The whole bio_integrity() definition is inside an #ifdef
CONFIG_BLK_DEV_INTEGRITY, there's no need for the conditional code.

Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 6520ee1..98c2d057 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -457,14 +457,7 @@ static inline int bio_has_data(struct bio *bio)
 #define bip_for_each_vec(bvl, bip, i)					\
 	__bip_for_each_vec(bvl, bip, i, (bip)->bip_idx)
 
-static inline int bio_integrity(struct bio *bio)
-{
-#if defined(CONFIG_BLK_DEV_INTEGRITY)
-	return bio->bi_integrity != NULL;
-#else
-	return 0;
-#endif
-}
+#define bio_integrity(bio) (bio->bi_integrity != NULL)
 
 extern struct bio_integrity_payload *bio_integrity_alloc_bioset(struct bio *, gfp_t, unsigned int, struct bio_set *);
 extern struct bio_integrity_payload *bio_integrity_alloc(struct bio *, gfp_t, unsigned int);