From: Kent Gibson <warthog618@gmail.com>
To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-kselftest@vger.kernel.org, bgolaszewski@baylibre.com,
linus.walleij@linaro.org, shuah@kernel.org, bamv2005@gmail.com
Cc: Kent Gibson <warthog618@gmail.com>
Subject: [PATCH v2 5/7] tools: gpio: remove uAPI v1 code no longer used by selftests
Date: Thu, 7 Jan 2021 10:57:29 +0800 [thread overview]
Message-ID: <20210107025731.226017-6-warthog618@gmail.com> (raw)
In-Reply-To: <20210107025731.226017-1-warthog618@gmail.com>
gpio-mockup-chardev helper has been obsoleted and removed, so also remove
the tools/gpio code that it, and nothing else, was using.
Signed-off-by: Kent Gibson <warthog618@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
tools/gpio/gpio-utils.c | 89 -----------------------------------------
tools/gpio/gpio-utils.h | 6 ---
2 files changed, 95 deletions(-)
diff --git a/tools/gpio/gpio-utils.c b/tools/gpio/gpio-utils.c
index 37187e056c8b..1639b4d832cd 100644
--- a/tools/gpio/gpio-utils.c
+++ b/tools/gpio/gpio-utils.c
@@ -32,74 +32,6 @@
* following api will request gpio lines, do the operation and then
* release these lines.
*/
-/**
- * gpiotools_request_linehandle() - request gpio lines in a gpiochip
- * @device_name: The name of gpiochip without prefix "/dev/",
- * such as "gpiochip0"
- * @lines: An array desired lines, specified by offset
- * index for the associated GPIO device.
- * @num_lines: The number of lines to request.
- * @flag: The new flag for requsted gpio. Reference
- * "linux/gpio.h" for the meaning of flag.
- * @data: Default value will be set to gpio when flag is
- * GPIOHANDLE_REQUEST_OUTPUT.
- * @consumer_label: The name of consumer, such as "sysfs",
- * "powerkey". This is useful for other users to
- * know who is using.
- *
- * Request gpio lines through the ioctl provided by chardev. User
- * could call gpiotools_set_values() and gpiotools_get_values() to
- * read and write respectively through the returned fd. Call
- * gpiotools_release_linehandle() to release these lines after that.
- *
- * Return: On success return the fd;
- * On failure return the errno.
- */
-int gpiotools_request_linehandle(const char *device_name, unsigned int *lines,
- unsigned int num_lines, unsigned int flag,
- struct gpiohandle_data *data,
- const char *consumer_label)
-{
- struct gpiohandle_request req;
- char *chrdev_name;
- int fd;
- int i;
- int ret;
-
- ret = asprintf(&chrdev_name, "/dev/%s", device_name);
- if (ret < 0)
- return -ENOMEM;
-
- fd = open(chrdev_name, 0);
- if (fd == -1) {
- ret = -errno;
- fprintf(stderr, "Failed to open %s, %s\n",
- chrdev_name, strerror(errno));
- goto exit_free_name;
- }
-
- for (i = 0; i < num_lines; i++)
- req.lineoffsets[i] = lines[i];
-
- req.flags = flag;
- strcpy(req.consumer_label, consumer_label);
- req.lines = num_lines;
- if (flag & GPIOHANDLE_REQUEST_OUTPUT)
- memcpy(req.default_values, data, sizeof(req.default_values));
-
- ret = ioctl(fd, GPIO_GET_LINEHANDLE_IOCTL, &req);
- if (ret == -1) {
- ret = -errno;
- fprintf(stderr, "Failed to issue %s (%d), %s\n",
- "GPIO_GET_LINEHANDLE_IOCTL", ret, strerror(errno));
- }
-
- if (close(fd) == -1)
- perror("Failed to close GPIO character device file");
-exit_free_name:
- free(chrdev_name);
- return ret < 0 ? ret : req.fd;
-}
/**
* gpiotools_request_line() - request gpio lines in a gpiochip
@@ -215,27 +147,6 @@ int gpiotools_get_values(const int fd, struct gpio_v2_line_values *values)
return ret;
}
-/**
- * gpiotools_release_linehandle(): Release the line(s) of gpiochip
- * @fd: The fd returned by
- * gpiotools_request_linehandle().
- *
- * Return: On success return 0;
- * On failure return the errno.
- */
-int gpiotools_release_linehandle(const int fd)
-{
- int ret;
-
- ret = close(fd);
- if (ret == -1) {
- perror("Failed to close GPIO LINEHANDLE device file");
- ret = -errno;
- }
-
- return ret;
-}
-
/**
* gpiotools_release_line(): Release the line(s) of gpiochip
* @fd: The fd returned by
diff --git a/tools/gpio/gpio-utils.h b/tools/gpio/gpio-utils.h
index 6c69a9f1c253..8af7c8ee19ce 100644
--- a/tools/gpio/gpio-utils.h
+++ b/tools/gpio/gpio-utils.h
@@ -24,12 +24,6 @@ static inline int check_prefix(const char *str, const char *prefix)
strncmp(str, prefix, strlen(prefix)) == 0;
}
-int gpiotools_request_linehandle(const char *device_name, unsigned int *lines,
- unsigned int num_lines, unsigned int flag,
- struct gpiohandle_data *data,
- const char *consumer_label);
-int gpiotools_release_linehandle(const int fd);
-
int gpiotools_request_line(const char *device_name,
unsigned int *lines,
unsigned int num_lines,
--
2.30.0
next prev parent reply other threads:[~2021-01-07 2:59 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 2:57 [PATCH v2 0/7] selftests: gpio: rework and port to GPIO uAPI v2 Kent Gibson
2021-01-07 2:57 ` [PATCH v2 1/7] selftests: gpio: rework and simplify test implementation Kent Gibson
2021-01-14 15:04 ` Bartosz Golaszewski
2021-01-17 23:54 ` Kent Gibson
2021-01-07 2:57 ` [PATCH v2 2/7] selftests: gpio: remove obsolete gpio-mockup-chardev.c Kent Gibson
2021-01-14 15:04 ` Bartosz Golaszewski
2021-01-07 2:57 ` [PATCH v2 3/7] selftests: remove obsolete build restriction for gpio Kent Gibson
2021-01-14 15:04 ` Bartosz Golaszewski
2021-01-07 2:57 ` [PATCH v2 4/7] selftests: remove obsolete gpio references from kselftest_deps.sh Kent Gibson
2021-01-14 15:05 ` Bartosz Golaszewski
2021-01-07 2:57 ` Kent Gibson [this message]
2021-01-14 15:12 ` [PATCH v2 5/7] tools: gpio: remove uAPI v1 code no longer used by selftests Bartosz Golaszewski
2021-01-07 2:57 ` [PATCH v2 6/7] selftests: gpio: port to GPIO uAPI v2 Kent Gibson
2021-01-14 15:13 ` Bartosz Golaszewski
2021-01-07 2:57 ` [PATCH v2 7/7] selftests: gpio: add CONFIG_GPIO_CDEV to config Kent Gibson
2021-01-14 15:13 ` Bartosz Golaszewski
2021-01-18 15:04 ` [PATCH v2 0/7] selftests: gpio: rework and port to GPIO uAPI v2 Linus Walleij
2021-01-19 0:34 ` Kent Gibson
2021-01-19 10:37 ` Bartosz Golaszewski
2021-01-19 10:59 ` Kent Gibson
2021-01-19 11:02 ` Bartosz Golaszewski
2021-01-19 11:21 ` Kent Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210107025731.226017-6-warthog618@gmail.com \
--to=warthog618@gmail.com \
--cc=bamv2005@gmail.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).