Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cbfca66 authored by Andrew Jeffery's avatar Andrew Jeffery Committed by Linus Walleij
Browse files

gpio: Fix loose spelling 



Literally.

I expect "lose" was meant here, rather than "loose", though you could feasibly
use a somewhat uncommon definition of "loose" to mean what would be meant by
"lose": "Loose the hounds" for instance, as in "Release the hounds".
Substituting in "value" for "hounds" gives "release the value", and makes some
sense, but futher substituting back to loose gives "loose the value" which
overall just seems a bit anachronistic.

Instead, use modern, pragmatic English and save a character.

Cc: Russell Currey <ruscur@russell.cc>
Signed-off-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b2f68edf

drivers/gpio/gpiolib-of.c

+2 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, 
			*flags |= GPIO_OPEN_SOURCE;

	}



	if (of_flags & OF_GPIO_SLEEP_MAY_LOOSE_VALUE)

		*flags |= GPIO_SLEEP_MAY_LOOSE_VALUE;

	if (of_flags & OF_GPIO_SLEEP_MAY_LOSE_VALUE)

		*flags |= GPIO_SLEEP_MAY_LOSE_VALUE;



	return desc;

}

drivers/gpio/gpiolib.c

+3 −3
Original line number Diff line number Diff line
@@ -3010,7 +3010,7 @@ bool gpiochip_line_is_persistent(struct gpio_chip *chip, unsigned int offset) 
	if (offset >= chip->ngpio)

		return false;



	return !test_bit(FLAG_SLEEP_MAY_LOOSE_VALUE,

	return !test_bit(FLAG_SLEEP_MAY_LOSE_VALUE,

			 &chip->gpiodev->descs[offset].flags);

}

EXPORT_SYMBOL_GPL(gpiochip_line_is_persistent);
@@ -3435,8 +3435,8 @@ int gpiod_configure_flags(struct gpio_desc *desc, const char *con_id, 
		set_bit(FLAG_OPEN_DRAIN, &desc->flags);

	if (lflags & GPIO_OPEN_SOURCE)

		set_bit(FLAG_OPEN_SOURCE, &desc->flags);

	if (lflags & GPIO_SLEEP_MAY_LOOSE_VALUE)

		set_bit(FLAG_SLEEP_MAY_LOOSE_VALUE, &desc->flags);

	if (lflags & GPIO_SLEEP_MAY_LOSE_VALUE)

		set_bit(FLAG_SLEEP_MAY_LOSE_VALUE, &desc->flags);



	/* No particular flag request, return here... */

	if (!(dflags & GPIOD_FLAGS_BIT_DIR_SET)) {

drivers/gpio/gpiolib.h

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ struct gpio_desc { 
#define FLAG_OPEN_SOURCE 8	/* Gpio is open source type */

#define FLAG_USED_AS_IRQ 9	/* GPIO is connected to an IRQ */

#define FLAG_IS_HOGGED	11	/* GPIO is hogged */

#define FLAG_SLEEP_MAY_LOOSE_VALUE 12	/* GPIO may loose value in sleep */

#define FLAG_SLEEP_MAY_LOSE_VALUE 12	/* GPIO may lose value in sleep */



	/* Connection label */

	const char		*label;

include/dt-bindings/gpio/gpio.h

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ 


/* Bit 3 express GPIO suspend/resume persistence */

#define GPIO_SLEEP_MAINTAIN_VALUE 0

#define GPIO_SLEEP_MAY_LOOSE_VALUE 8

#define GPIO_SLEEP_MAY_LOSE_VALUE 8



#endif

include/linux/gpio/machine.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ enum gpio_lookup_flags { 
	GPIO_OPEN_DRAIN = (1 << 1),

	GPIO_OPEN_SOURCE = (1 << 2),

	GPIO_SLEEP_MAINTAIN_VALUE = (0 << 3),

	GPIO_SLEEP_MAY_LOOSE_VALUE = (1 << 3),

	GPIO_SLEEP_MAY_LOSE_VALUE = (1 << 3),

};



/**