aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-03-10 03:48:06 -0500
committerLinus Walleij <linus.walleij@linaro.org>2016-03-10 04:02:52 -0500
commitfae98164463948eb31d638fe207c25a3d2b9312f (patch)
treea5ece514ceeeca6b0f6173ccd4f42ff17c79b43a
parent9d93efe35ed011327999675d70bb1b12ccdbd62d (diff)
gpio: uapi: use 0xB4 as ioctl() major
The previous 'o' is in conflict and not very orderly assigned. We want to select an ioctl() major that does not conflict with the existining ones. Add the new reserved major (0xB4) to Documentation/ioctl/ioctl-number.txt Fixes: 3c702e9987e2 ("gpio: add a userspace chardev ABI for GPIOs") Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--Documentation/ioctl/ioctl-number.txt1
-rw-r--r--include/uapi/linux/gpio.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 91261a32a573..9369d3b0f09a 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -319,6 +319,7 @@ Code Seq#(hex) Include File Comments
319 <mailto:vgo@ratio.de> 319 <mailto:vgo@ratio.de>
3200xB1 00-1F PPPoX <mailto:mostrows@styx.uwaterloo.ca> 3200xB1 00-1F PPPoX <mailto:mostrows@styx.uwaterloo.ca>
3210xB3 00 linux/mmc/ioctl.h 3210xB3 00 linux/mmc/ioctl.h
3220xB4 00-0F linux/gpio.h <mailto:linux-gpio@vger.kernel.org>
3220xC0 00-0F linux/usb/iowarrior.h 3230xC0 00-0F linux/usb/iowarrior.h
3230xCA 00-0F uapi/misc/cxl.h 3240xCA 00-0F uapi/misc/cxl.h
3240xCA 80-8F uapi/scsi/cxlflash_ioctl.h 3250xCA 80-8F uapi/scsi/cxlflash_ioctl.h
diff --git a/include/uapi/linux/gpio.h b/include/uapi/linux/gpio.h
index dfe8ade2742d..d0a3cac72250 100644
--- a/include/uapi/linux/gpio.h
+++ b/include/uapi/linux/gpio.h
@@ -52,7 +52,7 @@ struct gpioline_info {
52 char consumer[32]; 52 char consumer[32];
53}; 53};
54 54
55#define GPIO_GET_CHIPINFO_IOCTL _IOR('o', 0x01, struct gpiochip_info) 55#define GPIO_GET_CHIPINFO_IOCTL _IOR(0xB4, 0x01, struct gpiochip_info)
56#define GPIO_GET_LINEINFO_IOCTL _IOWR('o', 0x02, struct gpioline_info) 56#define GPIO_GET_LINEINFO_IOCTL _IOWR(0xB4, 0x02, struct gpioline_info)
57 57
58#endif /* _UAPI_GPIO_H_ */ 58#endif /* _UAPI_GPIO_H_ */