tools: gpio: remove uAPI v1 code no longer used by selftests
authorKent Gibson <warthog618@gmail.com>
Tue, 19 Jan 2021 12:30:57 +0000 (20:30 +0800)
committerBartosz Golaszewski <bgolaszewski@baylibre.com>
Mon, 15 Feb 2021 10:43:28 +0000 (11:43 +0100)
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>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
tools/gpio/gpio-utils.c
tools/gpio/gpio-utils.h

index 37187e056c8bad1c67a4a769de59c1b22af102f7..1639b4d832cd9e35b34117df088f44ea194714a3 100644 (file)
  * 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
index 6c69a9f1c25383daa9bcf90acb594f2eca8af263..8af7c8ee19ce9d84a7a91365f42255cab07f750a 100644 (file)
@@ -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,