Commit 70d97e09 authored by Linus Walleij's avatar Linus Walleij
Browse files

Revert "gpio: expose pull-up/pull-down line flags to userspace" 



This reverts commit 8c550e94.

This was prematurely applied and we need to back it out to merge
a better version of the development track for this feature.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2f4133bb

drivers/gpio/gpiolib.c

+0 −12
Original line number Diff line number Diff line
@@ -422,8 +422,6 @@ struct linehandle_state { 
	(GPIOHANDLE_REQUEST_INPUT | \

	GPIOHANDLE_REQUEST_OUTPUT | \

	GPIOHANDLE_REQUEST_ACTIVE_LOW | \

	GPIOHANDLE_REQUEST_PULL_UP | \

	GPIOHANDLE_REQUEST_PULL_DOWN | \

	GPIOHANDLE_REQUEST_OPEN_DRAIN | \

	GPIOHANDLE_REQUEST_OPEN_SOURCE)
@@ -595,10 +593,6 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip) 
			set_bit(FLAG_OPEN_DRAIN, &desc->flags);

		if (lflags & GPIOHANDLE_REQUEST_OPEN_SOURCE)

			set_bit(FLAG_OPEN_SOURCE, &desc->flags);

		if (lflags & GPIOHANDLE_REQUEST_PULL_DOWN)

			set_bit(FLAG_PULL_DOWN, &desc->flags);

		if (lflags & GPIOHANDLE_REQUEST_PULL_UP)

			set_bit(FLAG_PULL_UP, &desc->flags);



		ret = gpiod_set_transitory(desc, false);

		if (ret < 0)
@@ -1098,10 +1092,6 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		if (test_bit(FLAG_OPEN_SOURCE, &desc->flags))

			lineinfo.flags |= (GPIOLINE_FLAG_OPEN_SOURCE |

					   GPIOLINE_FLAG_IS_OUT);

		if (test_bit(FLAG_PULL_DOWN, &desc->flags))

			lineinfo.flags |= GPIOLINE_FLAG_PULL_DOWN;

		if (test_bit(FLAG_PULL_UP, &desc->flags))

			lineinfo.flags |= GPIOLINE_FLAG_PULL_UP;



		if (copy_to_user(ip, &lineinfo, sizeof(lineinfo)))

			return -EFAULT;
@@ -2795,8 +2785,6 @@ static bool gpiod_free_commit(struct gpio_desc *desc) 
		clear_bit(FLAG_REQUESTED, &desc->flags);

		clear_bit(FLAG_OPEN_DRAIN, &desc->flags);

		clear_bit(FLAG_OPEN_SOURCE, &desc->flags);

		clear_bit(FLAG_PULL_UP, &desc->flags);

		clear_bit(FLAG_PULL_DOWN, &desc->flags);

		clear_bit(FLAG_IS_HOGGED, &desc->flags);

		ret = true;

	}

include/uapi/linux/gpio.h

+0 −4
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ struct gpiochip_info { 
#define GPIOLINE_FLAG_ACTIVE_LOW	(1UL << 2)

#define GPIOLINE_FLAG_OPEN_DRAIN	(1UL << 3)

#define GPIOLINE_FLAG_OPEN_SOURCE	(1UL << 4)

#define GPIOLINE_FLAG_PULL_UP	(1UL << 5)

#define GPIOLINE_FLAG_PULL_DOWN	(1UL << 6)



/**

 * struct gpioline_info - Information about a certain GPIO line
@@ -64,8 +62,6 @@ struct gpioline_info { 
#define GPIOHANDLE_REQUEST_ACTIVE_LOW	(1UL << 2)

#define GPIOHANDLE_REQUEST_OPEN_DRAIN	(1UL << 3)

#define GPIOHANDLE_REQUEST_OPEN_SOURCE	(1UL << 4)

#define GPIOHANDLE_REQUEST_PULL_UP	(1UL << 5)

#define GPIOHANDLE_REQUEST_PULL_DOWN	(1UL << 6)



/**

 * struct gpiohandle_request - Information about a GPIO handle request