aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2014-07-06 21:06:43 -0400
committerRichard Yao <[email protected]>2015-09-04 15:37:24 -0400
commit7d6e2adb4e4a60efe2a906faf00d134c0403dda5 (patch)
tree44a8792a931a4ff304f8b7ee732650b777b161a1 /include/linux
parentf952eaa7ec48eb72ccff31ce74e4699caebf565d (diff)
Remove blk_rq_bytes()/blk_rq_sectors autotools checks
Signed-off-by: Richard Yao <[email protected]>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blkdev_compat.h23
1 files changed, 0 insertions, 23 deletions
diff --git a/include/linux/blkdev_compat.h b/include/linux/blkdev_compat.h
index 2842af7e3..c3c466bc2 100644
--- a/include/linux/blkdev_compat.h
+++ b/include/linux/blkdev_compat.h
@@ -52,29 +52,6 @@ __blk_queue_flush(struct request_queue *q, unsigned int flags)
q->flush_flags = flags & (REQ_FLUSH | REQ_FUA);
}
#endif /* HAVE_BLK_QUEUE_FLUSH && HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */
-
-#ifndef HAVE_BLK_RQ_SECTORS
-static inline unsigned int
-blk_rq_sectors(struct request *req)
-{
- return (req->nr_sectors);
-}
-#endif /* HAVE_BLK_RQ_SECTORS */
-
-#if !defined(HAVE_BLK_RQ_BYTES) || defined(HAVE_BLK_RQ_BYTES_GPL_ONLY)
-/*
- * Define required to avoid conflicting 2.6.29 non-static prototype for a
- * GPL-only version of the helper. As of 2.6.31 the helper is available
- * to non-GPL modules in the form of a static inline in the header.
- */
-#define blk_rq_bytes __blk_rq_bytes
-static inline unsigned int
-__blk_rq_bytes(struct request *req)
-{
- return (blk_rq_sectors(req) << 9);
-}
-#endif /* !HAVE_BLK_RQ_BYTES || HAVE_BLK_RQ_BYTES_GPL_ONLY */
-
/*
* Most of the blk_* macros were removed in 2.6.36. Ostensibly this was
* done to improve readability and allow easier grepping. However, from