From 0e7793202d05eae54e910f14aaa2d32070a781ae Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Wed, 4 Jan 2017 17:42:32 +0100 Subject: [PATCH] core: remove different gpiod_line_request() versions Until the request API is considered stable, remove all the request helpers. Signed-off-by: Bartosz Golaszewski --- gpiod.h | 32 -------------------------------- gpioset.c | 3 ++- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/gpiod.h b/gpiod.h index 1f6243b..7744ce8 100644 --- 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; diff --git a/gpioset.c b/gpioset.c index 58d5f0b..f2b1aca 100644 --- 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", -- 2.30.2