提交 d48c152a 编写于 作者: A Akinobu Mita 提交者: Jens Axboe

cciss: use check_signature()

Use check_signature() to find a signature in the mmio address.
Signed-off-by: NAkinobu Mita <akinobu.mita@gmail.com>
Cc: Mike Miller <mike.miller@hp.com>
Cc: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NJens Axboe <axboe@kernel.dk>
上级 1f118bc4
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
...@@ -4267,10 +4267,7 @@ static void __devinit cciss_find_board_params(ctlr_info_t *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) static inline bool CISS_signature_present(ctlr_info_t *h)
{ {
if ((readb(&h->cfgtable->Signature[0]) != 'C') || if (!check_signature(h->cfgtable->Signature, "CISS", 4)) {
(readb(&h->cfgtable->Signature[1]) != 'I') ||
(readb(&h->cfgtable->Signature[2]) != 'S') ||
(readb(&h->cfgtable->Signature[3]) != 'S')) {
dev_warn(&h->pdev->dev, "not a valid CISS config table\n"); dev_warn(&h->pdev->dev, "not a valid CISS config table\n");
return false; return false;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册