[PATCH] strip: use kernel min/max

Domen Puncer schrieb:
>
> Just some suggestions...
>
>> #define ELEMENTS_OF(X) (sizeof(X) / sizeof((X)[0]))
>
> Remove this define and s/ELEMENTS_OF/ARRAY_SIZE/g
>

There are more occurances of redundant ARRAY_SIZEs in the kernel. I will
keep that in mind!

>
>
>>@@ -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);
>
>
> max_t?

Changed that to max_t and min_t. A newbie queston: What should when be
preferred and why?

diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index f8d629e8d833260fec39b9dcc7829bd2f5bed13b..26cf41fb2aad2a439a306811c3a2bbc140f0455b 100644 (file)
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -82,6 +82,7 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE";
 /* Header files                                                                */
 
 #include <linux/config.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <asm/system.h>
@@ -454,10 +455,7 @@ static spinlock_t strip_lock = SPIN_LOCK_UNLOCKED;
 
 #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)]))
+#define ARRAY_END(X) (&((X)[ARRAY_SIZE(X)]))
 
 #define JIFFIE_TO_SEC(X) ((X) / HZ)
 
@@ -847,7 +845,7 @@ static __u8 *radio_address_to_string(const MetricomAddress * addr,
 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_t(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);
@@ -1467,7 +1465,7 @@ static void strip_send(struct strip *strip_info, struct sk_buff *skb)
                /* Cycle to next periodic command? */
                if (strip_info->firmware_level >= StructuredMessages)
                        if (++strip_info->next_command >=
-                           ELEMENTS_OF(CommandString))
+                           ARRAY_SIZE(CommandString))
                                strip_info->next_command = 0;
 #ifdef EXT_COUNTERS
                strip_info->tx_ebytes += ts.length;
@@ -1711,7 +1709,7 @@ static void get_radio_version(struct strip *strip_info, __u8 * ptr, __u8 * end)
        p++;
 
        len = value_end - value_begin;
-       len = MIN(len, sizeof(FirmwareVersion) - 1);
+       len = min_t(int, len, 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);