diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2012-11-09 01:12:23 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-11-23 14:28:34 +0100 |
| commit | d48c152a41c8cd6de832397b4ea6f0429ad86318 (patch) | |
| tree | 6a79b182e29421568cecce8922cde6e6d066f28a | |
| parent | cciss: cleanup bitops usage (diff) | |
| download | linux-d48c152a41c8cd6de832397b4ea6f0429ad86318.tar.xz linux-d48c152a41c8cd6de832397b4ea6f0429ad86318.zip | |
cciss: use check_signature()
Use check_signature() to find a signature in the mmio address.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Mike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/block/cciss.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index bda6d1282377..e04c63ec7759 100644 --- a/drivers/block/cciss.c +++ b/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; } |