diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2007-07-26 11:39:17 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-10-12 14:39:15 -0400 |
| commit | ce3a7f1202e02324841ef87d7d3f08ff351d07c7 (patch) | |
| tree | 410b3412a60a94215a3020c0be36b64527132991 /drivers/scsi/advansys.c | |
| parent | 9649af39e30d8d2668c35d008e8e14ae138e4d40 (diff) | |
| download | kernel-crypto-ce3a7f1202e02324841ef87d7d3f08ff351d07c7.tar.gz kernel-crypto-ce3a7f1202e02324841ef87d7d3f08ff351d07c7.tar.xz kernel-crypto-ce3a7f1202e02324841ef87d7d3f08ff351d07c7.zip | |
[SCSI] advansys: remove AscCompareString()
AscCompareString() is just another name for strncmp
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/advansys.c')
| -rw-r--r-- | drivers/scsi/advansys.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 424549d79b1..277002a5460 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -1911,7 +1911,6 @@ static int AscIsrChipHalted(ASC_DVC_VAR *); static uchar _AscCopyLramScsiDoneQ(PortAddr, ushort, ASC_QDONE_INFO *, ASC_DCNT); static int AscIsrQDone(ASC_DVC_VAR *); -static int AscCompareString(uchar *, uchar *, int); #ifdef CONFIG_ISA static ushort AscGetEisaChipCfg(PortAddr); #endif /* CONFIG_ISA */ @@ -10998,8 +10997,7 @@ AscAsyncFix(ASC_DVC_VAR *asc_dvc, uchar tid_no, ASC_SCSI_INQUIRY *inq) if (asc_dvc->bug_fix_cntl & ASC_BUG_FIX_ASYN_USE_SYN) { if (!(asc_dvc->init_sdtr & tid_bits)) { if ((dvc_type == TYPE_ROM) && - (AscCompareString((uchar *)inq->vendor_id, - (uchar *)"HP ", 3) == 0)) { + (strncmp(inq->vendor_id, "HP ", 3) == 0)) { asc_dvc->pci_fix_asyn_xfer_always |= tid_bits; } asc_dvc->pci_fix_asyn_xfer |= tid_bits; @@ -11022,10 +11020,8 @@ AscAsyncFix(ASC_DVC_VAR *asc_dvc, uchar tid_no, ASC_SCSI_INQUIRY *inq) static int AscTagQueuingSafe(ASC_SCSI_INQUIRY *inq) { if ((inq->add_len >= 32) && - (AscCompareString((uchar *)inq->vendor_id, - (uchar *)"QUANTUM XP34301", 15) == 0) && - (AscCompareString((uchar *)inq->product_rev_level, - (uchar *)"1071", 4) == 0)) { + (strncmp(inq->vendor_id, "QUANTUM XP34301", 15) == 0) && + (strncmp(inq->product_rev_level, "1071", 4) == 0)) { return 0; } return 1; @@ -11076,19 +11072,6 @@ AscInquiryHandling(ASC_DVC_VAR *asc_dvc, uchar tid_no, ASC_SCSI_INQUIRY *inq) return; } -static int AscCompareString(uchar *str1, uchar *str2, int len) -{ - int i; - int diff; - - for (i = 0; i < len; i++) { - diff = (int)(str1[i] - str2[i]); - if (diff != 0) - return (diff); - } - return (0); -} - static uchar AscReadLramByte(PortAddr iop_base, ushort addr) { uchar byte_data; |