[PATCH v4] staging: lustre: lnet: remove dead code and crc32_le() wrapper

[Dmitriy Cherkasov]

After removing code which was permanently disabled with ifdefs, the
function ksocknal_csum() becomes just a wrapper for crc32_le(). Remove
this useless wrapper and instead call crc32_le() directly.

This also resolves the following checkpatch warning which was
triggered by the dead code:

WARNING: space prohibited before semicolon

Signed-off-by: Dmitriy Cherkasov <dmit...@oss-tech.org>
---

Changes since v3:
        * fixed spacing issues
        * fixed typo in commit message

 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h  | 11 -----------
 .../staging/lustre/lnet/klnds/socklnd/socklnd_lib.c  | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h 
b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
index 5540de6..9eb169d 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
@@ -519,17 +519,6 @@ struct ksock_proto {
 #define CPU_MASK_NONE   0UL
 #endif
 
-static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t 
len)
-{
-#if 1
-       return crc32_le(crc, p, len);
-#else
-       while (len-- > 0)
-               crc = ((crc + 0x100) & ~0xff) | ((crc + *p++) & 0xff) ;
-       return crc;
-#endif
-}
-
 static inline int
 ksocknal_route_mask(void)
 {
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c 
b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
index 8a036f4..41715cd 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c
@@ -201,9 +201,9 @@
                        if (fragnob > sum)
                                fragnob = sum;
 
-                       conn->ksnc_rx_csum = ksocknal_csum(conn->ksnc_rx_csum,
-                                                          iov[i].iov_base,
-                                                          fragnob);
+                       conn->ksnc_rx_csum = crc32_le(conn->ksnc_rx_csum,
+                                                       iov[i].iov_base,
+                                                       fragnob);
                }
                conn->ksnc_msg.ksm_csum = saved_csum;
        }
@@ -243,8 +243,8 @@
                        if (fragnob > sum)
                                fragnob = sum;
 
-                       conn->ksnc_rx_csum = ksocknal_csum(conn->ksnc_rx_csum,
-                                                          base, fragnob);
+                       conn->ksnc_rx_csum = crc32_le(conn->ksnc_rx_csum,
+                                                       base, fragnob);
 
                        kunmap(kiov[i].bv_page);
                }
@@ -265,22 +265,22 @@
 
        tx->tx_msg.ksm_csum = 0;
 
-       csum = ksocknal_csum(~0, tx->tx_iov[0].iov_base,
-                            tx->tx_iov[0].iov_len);
+       csum = crc32_le(~0, tx->tx_iov[0].iov_base,
+                       tx->tx_iov[0].iov_len);
 
        if (tx->tx_kiov) {
                for (i = 0; i < tx->tx_nkiov; i++) {
                        base = kmap(tx->tx_kiov[i].bv_page) +
                               tx->tx_kiov[i].bv_offset;
 
-                       csum = ksocknal_csum(csum, base, tx->tx_kiov[i].bv_len);
+                       csum = crc32_le(csum, base, tx->tx_kiov[i].bv_len);
 
                        kunmap(tx->tx_kiov[i].bv_page);
                }
        } else {
                for (i = 1; i < tx->tx_niov; i++)
-                       csum = ksocknal_csum(csum, tx->tx_iov[i].iov_base,
-                                            tx->tx_iov[i].iov_len);
+                       csum = crc32_le(csum, tx->tx_iov[i].iov_base,
+                                       tx->tx_iov[i].iov_len);
        }
 
        if (*ksocknal_tunables.ksnd_inject_csum_error) {
-- 
1.9.1