git » linux-kernel » commit b044ecf

bio.h: Remove unused conditional code

author Alberto Bertogli
2008-09-27 01:56:25 UTC
committer Alberto Bertogli
2008-09-27 19:06:42 UTC
parent f18f258aa416010df475256a706451b4210797ed
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>
include/linux/bio.h +1 -8 
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 0933a14e641..57f95329cfc 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -458,14 +458,7 @@ static inline char *__bio_kmap_irq(struct bio *bio, unsigned short idx,
 #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);