From b75c918eca4f2cbd8ee61f6bf65661628d4cea5f Mon Sep 17 00:00:00 2001
From: Pete Wyckoff <pw@osc.edu>
Date: Tue, 1 Jan 2008 10:23:02 -0500
Subject: [PATCH] --- yaml --- r: 77637 b: refs/heads/master c:
 482eb689169948e9f4966fbae6be4d6bc0bfa818 h: refs/heads/master i:   77635:
 996ac0a6abfc04c0621323c8b5810df01bfa47a7 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/blkdev.h | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index eb7f453e9486..317e267c6889 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6da127ad0918f93ea93678dad62ce15ffed18797
+refs/heads/master: 482eb689169948e9f4966fbae6be4d6bc0bfa818
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index 49b7a4c31a6d..c7a3ab575c24 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -836,12 +836,7 @@ static inline int bdev_hardsect_size(struct block_device *bdev)
 
 static inline int queue_dma_alignment(struct request_queue *q)
 {
-	int retval = 511;
-
-	if (q && q->dma_alignment)
-		retval = q->dma_alignment;
-
-	return retval;
+	return q ? q->dma_alignment : 511;
 }
 
 /* assumes size > 256 */