This patch replaces UPDATE_STATS_GB macro in slic.h header file
into an inline function. This provides type safety and readability.

Signed-off-by: Sergio Paracuellos <sergio.paracuel...@gmail.com>
---
 drivers/staging/slicoss/slic.h    |  6 ++---
 drivers/staging/slicoss/slicoss.c | 56 ++++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h
index 2c05868..b19ddc9 100644
--- a/drivers/staging/slicoss/slic.h
+++ b/drivers/staging/slicoss/slic.h
@@ -548,9 +548,9 @@ static inline void slic_flush_write(struct adapter *adapter)
        ioread32(adapter->regs + SLIC_REG_HOSTID);
 }
 
-#define UPDATE_STATS_GB(largestat, newstat, oldstat)                     \
-{                                                                        \
-       (largestat) += ((newstat) - (oldstat));                          \
+static inline u64 update_stats_gb(const u64 newstat, const u64 oldstat)
+{
+       return (newstat - oldstat);
 }
 
 #if BITS_PER_LONG == 64
diff --git a/drivers/staging/slicoss/slicoss.c 
b/drivers/staging/slicoss/slicoss.c
index b6ec0a1..6d2f9cc 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -1014,45 +1014,47 @@ static void slic_upr_request_complete(struct adapter 
*adapter, u32 isr)
                        break;
                }
 
-               UPDATE_STATS_GB(stst->tcp.xmit_tcp_segs, stats->xmit_tcp_segs,
-                               old->xmit_tcp_segs);
+               stst->tcp.xmit_tcp_segs = update_stats_gb(stats->xmit_tcp_segs,
+                                                         old->xmit_tcp_segs);
 
-               UPDATE_STATS_GB(stst->tcp.xmit_tcp_bytes, stats->xmit_tcp_bytes,
-                               old->xmit_tcp_bytes);
+               stst->tcp.xmit_tcp_bytes =
+                       update_stats_gb(stats->xmit_tcp_bytes,
+                                       old->xmit_tcp_bytes);
 
-               UPDATE_STATS_GB(stst->tcp.rcv_tcp_segs, stats->rcv_tcp_segs,
-                               old->rcv_tcp_segs);
+               stst->tcp.rcv_tcp_segs = update_stats_gb(stats->rcv_tcp_segs,
+                                                        old->rcv_tcp_segs);
 
-               UPDATE_STATS_GB(stst->tcp.rcv_tcp_bytes, stats->rcv_tcp_bytes,
-                               old->rcv_tcp_bytes);
+               stst->tcp.rcv_tcp_bytes = update_stats_gb(stats->rcv_tcp_bytes,
+                                                         old->rcv_tcp_bytes);
 
-               UPDATE_STATS_GB(stst->iface.xmt_bytes, stats->xmit_bytes,
-                               old->xmit_bytes);
+               stst->iface.xmt_bytes = update_stats_gb(stats->xmit_bytes,
+                                                       old->xmit_bytes);
 
-               UPDATE_STATS_GB(stst->iface.xmt_ucast, stats->xmit_unicasts,
-                               old->xmit_unicasts);
+               stst->iface.xmt_ucast = update_stats_gb(stats->xmit_unicasts,
+                                                       old->xmit_unicasts);
 
-               UPDATE_STATS_GB(stst->iface.rcv_bytes, stats->rcv_bytes,
-                               old->rcv_bytes);
+               stst->iface.rcv_bytes = update_stats_gb(stats->rcv_bytes,
+                                                       old->rcv_bytes);
 
-               UPDATE_STATS_GB(stst->iface.rcv_ucast, stats->rcv_unicasts,
-                               old->rcv_unicasts);
+               stst->iface.rcv_ucast = update_stats_gb(stats->rcv_unicasts,
+                                                       old->rcv_unicasts);
 
-               UPDATE_STATS_GB(stst->iface.xmt_errors, stats->xmit_collisions,
-                               old->xmit_collisions);
+               stst->iface.xmt_errors = update_stats_gb(stats->xmit_collisions,
+                                                        old->xmit_collisions);
 
-               UPDATE_STATS_GB(stst->iface.xmt_errors,
-                               stats->xmit_excess_collisions,
-                               old->xmit_excess_collisions);
+               stst->iface.xmt_errors =
+                       update_stats_gb(stats->xmit_excess_collisions,
+                                       old->xmit_excess_collisions);
 
-               UPDATE_STATS_GB(stst->iface.xmt_errors, stats->xmit_other_error,
-                               old->xmit_other_error);
+               stst->iface.xmt_errors =
+                       update_stats_gb(stats->xmit_other_error,
+                                       old->xmit_other_error);
 
-               UPDATE_STATS_GB(stst->iface.rcv_errors, stats->rcv_other_error,
-                               old->rcv_other_error);
+               stst->iface.rcv_errors = update_stats_gb(stats->rcv_other_error,
+                                                         old->rcv_other_error);
 
-               UPDATE_STATS_GB(stst->iface.rcv_discards, stats->rcv_drops,
-                               old->rcv_drops);
+               stst->iface.rcv_discards = update_stats_gb(stats->rcv_drops,
+                                                          old->rcv_drops);
 
                if (stats->rcv_drops > old->rcv_drops)
                        adapter->rcv_drops += (stats->rcv_drops -
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to