diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 49b7a4c..c7a3ab5 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -836,12 +836,7 @@
 
 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 */