Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools: gpio: port gpio-watch to v2 uAPI

Port the gpio-watch tool to the latest GPIO uAPI.

Signed-off-by: Kent Gibson <warthog618@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

authored by

Kent Gibson and committed by
Bartosz Golaszewski
e86a863b 3c333c47

+8 -8
+8 -8
tools/gpio/gpio-watch.c
··· 21 21 22 22 int main(int argc, char **argv) 23 23 { 24 - struct gpioline_info_changed chg; 25 - struct gpioline_info req; 24 + struct gpio_v2_line_info_changed chg; 25 + struct gpio_v2_line_info req; 26 26 struct pollfd pfd; 27 27 int fd, i, j, ret; 28 28 char *event, *end; ··· 40 40 for (i = 0, j = 2; i < argc - 2; i++, j++) { 41 41 memset(&req, 0, sizeof(req)); 42 42 43 - req.line_offset = strtoul(argv[j], &end, 0); 43 + req.offset = strtoul(argv[j], &end, 0); 44 44 if (*end != '\0') 45 45 goto err_usage; 46 46 47 - ret = ioctl(fd, GPIO_GET_LINEINFO_WATCH_IOCTL, &req); 47 + ret = ioctl(fd, GPIO_V2_GET_LINEINFO_WATCH_IOCTL, &req); 48 48 if (ret) { 49 49 perror("unable to set up line watch"); 50 50 return EXIT_FAILURE; ··· 71 71 } 72 72 73 73 switch (chg.event_type) { 74 - case GPIOLINE_CHANGED_REQUESTED: 74 + case GPIO_V2_LINE_CHANGED_REQUESTED: 75 75 event = "requested"; 76 76 break; 77 - case GPIOLINE_CHANGED_RELEASED: 77 + case GPIO_V2_LINE_CHANGED_RELEASED: 78 78 event = "released"; 79 79 break; 80 - case GPIOLINE_CHANGED_CONFIG: 80 + case GPIO_V2_LINE_CHANGED_CONFIG: 81 81 event = "config changed"; 82 82 break; 83 83 default: ··· 87 87 } 88 88 89 89 printf("line %u: %s at %llu\n", 90 - chg.info.line_offset, event, chg.timestamp); 90 + chg.info.offset, event, chg.timestamp_ns); 91 91 } 92 92 } 93 93