From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 8 Nov 2018 20:36:35 +0000 (-0500)
Subject: Drop kstrtox.h wrapper
X-Git-Tag: v2.12.0-pre~94
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1a9417eff577487d328d24dc6104b93e973e23e8;p=lttng-modules.git

Drop kstrtox.h wrapper

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/tests/probes/lttng-test.c b/tests/probes/lttng-test.c
index 42e48cf2..d1278183 100644
--- a/tests/probes/lttng-test.c
+++ b/tests/probes/lttng-test.c
@@ -16,7 +16,6 @@
 #include <lttng-events.h>
 #include <lttng-tracer.h>
 #include <wrapper/tracepoint.h>
-#include <wrapper/kstrtox.h>
 
 #define TP_MODULE_NOAUTOLOAD
 #define LTTNG_PACKAGE_BUILD
@@ -69,7 +68,7 @@ ssize_t lttng_test_filter_event_write(struct file *file, const char __user *user
 	int ret;
 
 	/* Get the number of iterations */
-	ret = lttng_kstrtouint_from_user(user_buf, count, 10, &nr_iter);
+	ret = kstrtouint_from_user(user_buf, count, 10, &nr_iter);
 	if (ret) {
 		written = ret;
 		goto end;
diff --git a/wrapper/kstrtox.h b/wrapper/kstrtox.h
deleted file mode 100644
index b0c6cf8f..00000000
--- a/wrapper/kstrtox.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
- *
- * wrapper/kstrtox.h
- *
- * Copyright (C) 2015 Michael Jeanson <mjeanson@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_KSTRTOX_H
-#define _LTTNG_WRAPPER_KSTRTOX_H
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
-
-#include <linux/uaccess.h>
-
-/* Excludes final \0. */
-#define LTTNG_MAX_UINT_CHAR 10
-
-static inline
-int __must_check lttng_kstrtouint_from_user(const char __user *ubuf,
-		size_t count, unsigned int base, unsigned int *res)
-{
-	unsigned int _res;
-	char kbuf[LTTNG_MAX_UINT_CHAR + 1], *endptr;
-
-	memset(kbuf, 0, sizeof(kbuf));
-	if (copy_from_user(kbuf, ubuf, min_t(size_t, LTTNG_MAX_UINT_CHAR, count)))
-		return -EFAULT;
-
-	_res = simple_strtoul(kbuf, &endptr, base);
-	if (!endptr)
-		return -EINVAL;
-
-	*res = _res;
-	return 0;
-}
-#else
-static inline
-int __must_check lttng_kstrtouint_from_user(const char __user *ubuf,
-		size_t count, unsigned int base, unsigned int *res)
-{
-	return kstrtouint_from_user(ubuf, count, base, res);
-}
-#endif
-
-#endif /* _LTTNG_WRAPPER_KSTRTOX_H */