tipc: nuke the delimit static inline function.

This "shortform" is actually longer than typing out what it is really
trying to do, and just makes reading the code more difficult, so
lets simply shoot it in the head.

In the case of log.c - the comparison is on a u32, so we can drop the
check for < 0 at the same time.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/net/tipc/config.c b/net/tipc/config.c
index 9fefd32e9b2e0c6649ea13537a4cc1db4d91c668..69cca4f67e8e71a485247c9b15c4794cbff28bf5 100644 (file)
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -218,7 +218,7 @@ static struct sk_buff *cfg_set_max_publications(void)
                return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
 
        value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
-       if (value != delimit(value, 1, 65535))
+       if (value < 1 || value > 65535)
                return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                   " (max publications must be 1-65535)");
        tipc_max_publications = value;
@@ -233,7 +233,7 @@ static struct sk_buff *cfg_set_max_subscriptions(void)
                return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
 
        value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
-       if (value != delimit(value, 1, 65535))
+       if (value < 1 || value > 65535)
                return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                   " (max subscriptions must be 1-65535");
        tipc_max_subscriptions = value;
@@ -249,7 +249,7 @@ static struct sk_buff *cfg_set_max_ports(void)
        value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
        if (value == tipc_max_ports)
                return tipc_cfg_reply_none();
-       if (value != delimit(value, 127, 65535))
+       if (value < 127 || value > 65535)
                return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                   " (max ports must be 127-65535)");
        if (tipc_mode != TIPC_NOT_RUNNING)
@@ -268,7 +268,7 @@ static struct sk_buff *cfg_set_netid(void)
        value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
        if (value == tipc_net_id)
                return tipc_cfg_reply_none();
-       if (value != delimit(value, 1, 9999))
+       if (value < 1 || value > 9999)
                return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                   " (network id must be 1-9999)");
        if (tipc_mode == TIPC_NET_MODE)

diff --git a/net/tipc/core.h b/net/tipc/core.h
index 2761af36d1412d4d4fd8a8f21f2a2174293d43e9..1260b053bf2570a5af2279c10023fb511e07f6b2 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -168,16 +168,6 @@ extern void tipc_netlink_stop(void);
 extern int  tipc_socket_init(void);
 extern void tipc_socket_stop(void);
 
-static inline int delimit(int val, int min, int max)
-{
-       if (val > max)
-               return max;
-       if (val < min)
-               return min;
-       return val;
-}
-
-
 /*
  * TIPC timer and signal code
  */

diff --git a/net/tipc/log.c b/net/tipc/log.c
index 952c39f643e695427db25c8ea37db115e0519acd..895c6e530b0b9cbbceeb28911743cdf8ac2fcff0 100644 (file)
--- a/net/tipc/log.c
+++ b/net/tipc/log.c
@@ -304,7 +304,7 @@ struct sk_buff *tipc_log_resize_cmd(const void *req_tlv_area, int req_tlv_space)
                return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
 
        value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
-       if (value != delimit(value, 0, 32768))
+       if (value > 32768)
                return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                   " (log size must be 0-32768)");
        if (tipc_log_resize(value))