From d5df952ac3135679f026fe3eba7d74cb1cefcc1c Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Thu, 8 Nov 2012 16:12:23 -0800
Subject: [PATCH] --- yaml --- r: 346283 b: refs/heads/master c:
 d48c152a41c8cd6de832397b4ea6f0429ad86318 h: refs/heads/master i:   346281:
 90a81f018a827917bc886979ef9305a364024427   346279:
 c75a8d0599906daf381951fedfbad3b77e1af9bd v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/block/cciss.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 39d5a63b8716..355e7c3ba4e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f118bc479173bff44aa591bcfa065e68884f2c5
+refs/heads/master: d48c152a41c8cd6de832397b4ea6f0429ad86318
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index bda6d1282377..e04c63ec7759 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -42,8 +42,8 @@
 #include <linux/compat.h>
 #include <linux/mutex.h>
 #include <linux/bitmap.h>
+#include <linux/io.h>
 #include <asm/uaccess.h>
-#include <asm/io.h>
 
 #include <linux/dma-mapping.h>
 #include <linux/blkdev.h>
@@ -4267,10 +4267,7 @@ static void __devinit cciss_find_board_params(ctlr_info_t *h)
 
 static inline bool CISS_signature_present(ctlr_info_t *h)
 {
-	if ((readb(&h->cfgtable->Signature[0]) != 'C') ||
-	    (readb(&h->cfgtable->Signature[1]) != 'I') ||
-	    (readb(&h->cfgtable->Signature[2]) != 'S') ||
-	    (readb(&h->cfgtable->Signature[3]) != 'S')) {
+	if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {
 		dev_warn(&h->pdev->dev, "not a valid CISS config table\n");
 		return false;
 	}