Skip to contentSkip to conversation

cciss: use check_signature

PATCH [email protected] 1 participant 2 messages Apr 3, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw
Quoted 24 lines

Use check_signature to find a signature in the mmio address.

Signed-off-by Akinobu Mita <[email protected]>
Cc Mike Miller <[email protected]>
Cc [email protected]
---
 drivers/block/cciss.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/block/cciss.c +1 -1
index bda6d12..e04c63e 100644
@@ -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>

drivers/block/cciss.c static void __devinit cciss_find_board_params(ctlr_info_t *h) · line 4270

Quoted 8 lines
drivers/block/cciss.c +1 -4
@@ -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)) {

I noticed that in lib/Makefile, there's this:

[scameron@localhost linux-3.4-rc1]$ grep CHECK_SIG lib/Makefile obj-$(CONFIG_CHECK_SIGNATURE) += check_signature.o [scameron@localhost linux-3.4-rc1]$

although I don't see an '#if CONFIG_CHECK_SIGNATURE' in include/linux/io.h

Does there need to be a "select CHECK_SIGNATURE" added into in drivers/block/Kconfig in this area?

config BLK_CPQ_CISS_DA
tristate "Compaq Smart Array 5xxx support" depends on PCI
help

Or is this dependency handled in some way I'm just not seeing?

-- steve

Quoted 5 lines
drivers/block/cciss.c +0 -0
                 dev_warn(&h->pdev->dev, "not a valid CISS config table\n");
                 return false;
         }
Signature · 1 line
1.7.4.4
author
#1 lore raw
Quoted 1 line · On Tue, Apr 03, 2012 at 08:45:54AM -0500, [email protected] wrote:
Quoted 1 line

Use check_signature to find a signature in the mmio address.

Also, drivers/scsi/hpsa.c has similar code, the function hpsa_CISS_signature_present could be replaced by a call to check_signature, if you feel like making such a patch. (If not, I can do it.)

-- steve