From: Michael Veeck <michael.veeck@gmx.net>
To: kernel-janitors@vger.kernel.org
Subject: [Kernel-janitors] [PATCH] drivers/net/wireless/strip.c MIN/MAX removal
Date: Sat, 07 Feb 2004 15:35:05 +0000 [thread overview]
Message-ID: <402505A9.8060903@gmx.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 148 bytes --]
Hi!
Patch (against 2.6.3-rc1) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.
Feedback always welcome
Michael
[-- Attachment #2: minmax_drivers_net_wireless.patch --]
[-- Type: text/plain, Size: 1463 bytes --]
diff -Naur linux-2.6.2.org/drivers/net/wireless/strip.c linux-2.6.2.new/drivers/net/wireless/strip.c
--- linux-2.6.2.org/drivers/net/wireless/strip.c 2004-02-07 15:25:57.000000000 +0100
+++ linux-2.6.2.new/drivers/net/wireless/strip.c 2004-02-07 15:33:24.305031008 +0100
@@ -88,7 +88,7 @@
#include <asm/uaccess.h>
#include <asm/bitops.h>
-# include <linux/ctype.h>
+#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/interrupt.h>
@@ -454,8 +454,6 @@
#define READDEC(X) ((X)>='0' && (X)<='9' ? (X)-'0' : 0)
-#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
-#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
#define ELEMENTS_OF(X) (sizeof(X) / sizeof((X)[0]))
#define ARRAY_END(X) (&((X)[ELEMENTS_OF(X)]))
@@ -847,7 +845,7 @@
static int allocate_buffers(struct strip *strip_info, int mtu)
{
struct net_device *dev = strip_info->dev;
- int sx_size = MAX(STRIP_ENCAP_SIZE(MAX_RECV_MTU), 4096);
+ int sx_size = max((int)STRIP_ENCAP_SIZE(MAX_RECV_MTU), 4096);
int tx_size = STRIP_ENCAP_SIZE(mtu) + MaxCommandStringLength;
__u8 *r = kmalloc(MAX_RECV_MTU, GFP_ATOMIC);
__u8 *s = kmalloc(sx_size, GFP_ATOMIC);
@@ -1709,7 +1707,7 @@
p++;
len = value_end - value_begin;
- len = MIN(len, sizeof(FirmwareVersion) - 1);
+ len = min(len, (int) sizeof(FirmwareVersion) - 1);
if (strip_info->firmware_version.c[0] == 0)
printk(KERN_INFO "%s: Radio Firmware: %.*s\n",
strip_info->dev->name, len, value_begin);
[-- Attachment #3: Type: text/plain, Size: 163 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
next reply other threads:[~2004-02-07 15:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-02-07 15:35 Michael Veeck [this message]
2004-02-07 17:41 ` [Kernel-janitors] [PATCH] drivers/net/wireless/strip.c MIN/MAX Domen Puncer
2004-02-07 20:24 ` Michael Veeck
2004-02-07 21:31 ` Domen Puncer
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=402505A9.8060903@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.