From: Michael Veeck <michael.veeck@gmx.net>
To: kernel-janitors@vger.kernel.org
Subject: [Kernel-janitors] [PATCH] drivers/scsi/pcmcia MIN/MAX/NUMBER removal
Date: Thu, 22 Apr 2004 22:14:45 +0000 [thread overview]
Message-ID: <408843D5.5070505@gmx.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
Patch (against 2.6.6-rc1) removes unnecessary min/max/number macros and
changes calls to use kernel.h macros instead.
Feedback is always welcome
Michael
[-- Attachment #2: minmax_drivers_scsi_pcmcia.patch --]
[-- Type: text/plain, Size: 2307 bytes --]
diff -Naur -X dontdiff-osdl linux-2.6.5.org/drivers/scsi/pcmcia/nsp_cs.c linux-2.6.5.new/drivers/scsi/pcmcia/nsp_cs.c
--- linux-2.6.5.org/drivers/scsi/pcmcia/nsp_cs.c 2004-04-04 05:38:22.000000000 +0200
+++ linux-2.6.5.new/drivers/scsi/pcmcia/nsp_cs.c 2004-04-22 22:03:57.468330608 +0200
@@ -315,7 +315,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
- thislength = MIN(thislength, length);
+ thislength = min(thislength, length);
*start = buffer + offset;
return thislength;
diff -Naur -X dontdiff-osdl linux-2.6.5.org/drivers/scsi/pcmcia/nsp_cs.h linux-2.6.5.new/drivers/scsi/pcmcia/nsp_cs.h
--- linux-2.6.5.org/drivers/scsi/pcmcia/nsp_cs.h 2004-04-04 05:36:57.000000000 +0200
+++ linux-2.6.5.new/drivers/scsi/pcmcia/nsp_cs.h 2004-04-22 22:02:53.674028816 +0200
@@ -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
[-- Attachment #3: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
reply other threads:[~2004-04-22 22:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=408843D5.5070505@gmx.net \
--to=michael.veeck@gmx.net \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.