From: Akinobu Mita Date: Wed, 26 Sep 2012 01:33:06 +0000 (+1000) Subject: cciss: use check_signature() X-Git-Tag: next-20120926~2^2~376 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=55cd98cf5fbc178ccea03b33b99f55b9a9a4c9c8;p=karo-tx-linux.git cciss: use check_signature() Use check_signature() to find a signature in the mmio address. Signed-off-by: Akinobu Mita Cc: Mike Miller Cc: Jens Axboe Cc: Stephen M. Cameron Signed-off-by: Andrew Morton --- diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 9d135124bfdd..6526157edafc 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -42,8 +42,8 @@ #include #include #include +#include #include -#include #include #include @@ -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; }