|
@@ -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;
|
|
|
}
|