From 8e46236c21f68c2d61130e9250564b241d5765f0 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rddunlap@osdl.org>
Date: Mon, 3 May 2004 23:22:56 -0500
Subject: [PATCH] [PATCH] (5/5) pcmcia/nsp: use kernel.h min/max/ARRAY_SIZE
From: Michael Veeck <michael.veeck@gmx.net>
Subject: [Kernel-janitors] [PATCH] drivers/scsi/pcmcia MIN/MAX/NUMBER removal
Patch (against 2.6.6-rc1) removes unnecessary min/max/number macros and
changes calls to use kernel.h macros instead.
drivers/scsi/pcmcia/nsp_cs.c | 12 ++++++------
drivers/scsi/pcmcia/nsp_cs.h | 2 --
2 files changed, 6 insertions(+), 8 deletions(-)
---
drivers/scsi/pcmcia/nsp_cs.c | 12 ++++++------
drivers/scsi/pcmcia/nsp_cs.h | 2 --
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 52c8ed23451a..e5cc3e4b5ab2 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -315,7 +315,7 @@ static void nsphw_init_sync(nsp_hw_data *data)
int i;
/* setup sync data */
- for ( i = 0; i < NUMBER(data->Sync); i++ ) {
+ for ( i = 0; i < ARRAY_SIZE(data->Sync); i++ ) {
data->Sync[i] = tmp_sync;
}
}
@@ -600,7 +600,7 @@ static int nsp_xfer(Scsi_Cmnd *SCpnt, int phase)
unsigned int base = SCpnt->device->host->io_port;
nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;
char *buf = data->MsgBuffer;
- int len = MIN(MSGBUF_SIZE, data->MsgLen);
+ int len = min(MSGBUF_SIZE, data->MsgLen);
int ptr;
int ret;
@@ -774,7 +774,7 @@ static void nsp_pio_read(Scsi_Cmnd *SCpnt)
continue;
}
- res = MIN(res, SCpnt->SCp.this_residual);
+ res = min(res, SCpnt->SCp.this_residual);
switch (data->TransferMode) {
case MODE_IO32:
@@ -868,7 +868,7 @@ static void nsp_pio_write(Scsi_Cmnd *SCpnt)
continue;
}
- res = MIN(SCpnt->SCp.this_residual, WFIFO_CRIT);
+ res = min(SCpnt->SCp.this_residual, WFIFO_CRIT);
//nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x res=0x%x", SCpnt->SCp.ptr, SCpnt->SCp.this_residual, res);
switch (data->TransferMode) {
@@ -1490,7 +1490,7 @@ nsp_proc_info(
spin_unlock_irqrestore(&(data->Lock), flags);
SPRINTF("SDTR status\n");
- for(id = 0; id < NUMBER(data->Sync); id++) {
+ for(id = 0; id < ARRAY_SIZE(data->Sync); id++) {
SPRINTF("id %d: ", id);
@@ -1534,7 +1534,7 @@ nsp_proc_info(
}
- thislength = MIN(thislength, length);
+ thislength = min(thislength, length);
*start = buffer + offset;
return thislength;
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
index 38cec7efd073..c201b52e063a 100644
--- a/drivers/scsi/pcmcia/nsp_cs.h
+++ b/drivers/scsi/pcmcia/nsp_cs.h
@@ -26,9 +26,7 @@
/************************************
* Some useful macros...
*/
-#define NUMBER(arr) ((int) (sizeof(arr) / sizeof(arr[0]))) /* from XtNumber() in /usr/X11R6/include/X11/Intrinsic.h */
#define BIT(x) (1L << (x))
-#define MIN(a,b) ((a) > (b) ? (b) : (a))
/* SCSI initiator must be ID 7 */
#define NSP_INITIATOR_ID 7
--
2.30.9