Skip to contentSkip to conversation

Staging: lustre: config: Remove unnecessary wrapper functions

PATCH New Shivani Bhardwaj 1 participant 1 message Oct 29, 2015 Staging

lore
Share & tools
lore

Shivani Bhardwaj

author
#0 lore raw

PATCH 1/1 Staging: lustre: config: Remove unnecessary wrapper functions

Remove the function lnet_ipaddr_free_enumeration() and replace all its calls with LIBCFS_FREE().

Signed-off-by Shivani Bhardwaj <[email protected]>
---
 drivers/staging/lustre/lnet/lnet/config.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/staging/lustre/lnet/lnet/config.c +2 -8
index 1b3bc83..4e8b54b 100644
@@ -1103,12 +1103,6 @@ lnet_match_networks(char **networksp, char *ip2nets, __u32 *ipaddrs, int nip)
 	return count;
 }
 
-static void
-lnet_ipaddr_free_enumeration(__u32 *ipaddrs, int nip)
-{
-	LIBCFS_FREE(ipaddrs, nip * sizeof(*ipaddrs));
-}
-
 static int
 lnet_ipaddr_enumerate(__u32 **ipaddrsp)
 {

@@ -1169,7 +1163,7 @@ lnet_ipaddr_enumerate(__u32 **ipaddrsp)
 				rc = nip;
 			}
 		}
-		lnet_ipaddr_free_enumeration(ipaddrs, nif);
+		LIBCFS_FREE(ipaddrs, nip * sizeof(*ipaddrs));
 	}
 	return nip;
 }

@@ -1195,7 +1189,7 @@ lnet_parse_ip2nets(char **networksp, char *ip2nets)
 	}
 
 	rc = lnet_match_networks(networksp, ip2nets, ipaddrs, nip);
-	lnet_ipaddr_free_enumeration(ipaddrs, nip);
+	LIBCFS_FREE(ipaddrs, nip * sizeof(*ipaddrs));
 
 	if (rc < 0) {
 		LCONSOLE_ERROR_MSG(0x119, "Error %d parsing ip2nets\n", rc);
Signature · 1 line
2.1.0