core: remove different gpiod_line_request() versions
authorBartosz Golaszewski <bartekgola@gmail.com>
Wed, 4 Jan 2017 16:42:32 +0000 (17:42 +0100)
committerBartosz Golaszewski <bartekgola@gmail.com>
Wed, 4 Jan 2017 16:42:32 +0000 (17:42 +0100)
Until the request API is considered stable, remove all the request
helpers.

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
gpiod.h
gpioset.c

diff --git a/gpiod.h b/gpiod.h
index 1f6243b93e54d47fefc115a6f7a83f450fc194c8..7744ce87a13a7ccb180a2c6d0ed799105940676f 100644 (file)
--- a/gpiod.h
+++ b/gpiod.h
@@ -93,21 +93,6 @@ int gpiod_line_update(struct gpiod_line *line) GPIOD_API;
 int gpiod_line_request(struct gpiod_line *line, const char *consumer,
                       int default_val, int flags) GPIOD_API;
 
-static inline int gpiod_line_request_din(struct gpiod_line *line,
-                                        const char *consumer, int flags)
-{
-       return gpiod_line_request(line, consumer, 0,
-                                 flags | GPIOD_REQUEST_DIRECTION_INPUT);
-}
-
-static inline int gpiod_line_request_dout(struct gpiod_line *line,
-                                         const char *consumer,
-                                         int default_val, int flags)
-{
-       return gpiod_line_request(line, consumer, default_val,
-                                 flags | GPIOD_REQUEST_DIRECTION_OUTPUT);
-}
-
 struct gpiod_line_bulk {
        struct gpiod_line *lines[GPIOD_REQUEST_MAX_LINES];
        unsigned int num_lines;
@@ -130,23 +115,6 @@ int gpiod_line_request_bulk(struct gpiod_line_bulk *line_bulk,
                            const char *consumer, int *default_vals,
                            int flags) GPIOD_API;
 
-static inline int
-gpiod_line_request_bulk_din(struct gpiod_line_bulk *line_bulk,
-                           const char *consumer, int flags)
-{
-       return gpiod_line_request_bulk(line_bulk, consumer, NULL,
-                                      flags | GPIOD_REQUEST_DIRECTION_INPUT);
-}
-
-static inline int
-gpiod_line_request_bulk_dout(struct gpiod_line_bulk *line_bulk,
-                            const char *consumer, int *default_vals,
-                            int flags)
-{
-       return gpiod_line_request_bulk(line_bulk, consumer, default_vals,
-                                      flags | GPIOD_REQUEST_DIRECTION_INPUT);
-}
-
 void gpiod_line_release(struct gpiod_line *line) GPIOD_API;
 
 void gpiod_line_release_bulk(struct gpiod_line_bulk *line_bulk) GPIOD_API;
index 58d5f0b55e982a1c590f83e5eb65e34a0c7d0629..f2b1acac859ccd0ed6b7f40cabc3bb03824ff56c 100644 (file)
--- a/gpioset.c
+++ b/gpioset.c
@@ -68,7 +68,8 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
-       status = gpiod_line_request_dout(line, "gpioset", value, 0);
+       status = gpiod_line_request(line, "gpioset",
+                                   value, GPIOD_REQUEST_DIRECTION_OUTPUT);
        if (status < 0) {
                fprintf(stderr,
                        "%s: error requesting GPIO line: %s\n",