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

Commit 756a7334 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:

 - move freeing of GPIO hogs to after freeing the device to get rid of a
   warning state.

 - a small compile warning fix

* tag 'gpio-v4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: Move freeing of GPIO hogs before numbing of the device
  gpio: mxs: remove __init annotation
parents c92f5bdc 5018ada6

drivers/gpio/gpio-mxs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -205,7 +205,7 @@ static int mxs_gpio_set_wake_irq(struct irq_data *d, unsigned int enable) 
	return 0;

	return 0;

}

}





static int __init mxs_gpio_init_gc(struct mxs_gpio_port *port, int irq_base)

static int mxs_gpio_init_gc(struct mxs_gpio_port *port, int irq_base)

{

{

	struct irq_chip_generic *gc;

	struct irq_chip_generic *gc;

	struct irq_chip_type *ct;

	struct irq_chip_type *ct;

drivers/gpio/gpiolib.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1317,12 +1317,12 @@ void gpiochip_remove(struct gpio_chip *chip) 




	/* FIXME: should the legacy sysfs handling be moved to gpio_device? */

	/* FIXME: should the legacy sysfs handling be moved to gpio_device? */

	gpiochip_sysfs_unregister(gdev);

	gpiochip_sysfs_unregister(gdev);

	gpiochip_free_hogs(chip);

	/* Numb the device, cancelling all outstanding operations */

	/* Numb the device, cancelling all outstanding operations */

	gdev->chip = NULL;

	gdev->chip = NULL;

	gpiochip_irqchip_remove(chip);

	gpiochip_irqchip_remove(chip);

	acpi_gpiochip_remove(chip);

	acpi_gpiochip_remove(chip);

	gpiochip_remove_pin_ranges(chip);

	gpiochip_remove_pin_ranges(chip);

	gpiochip_free_hogs(chip);

	of_gpiochip_remove(chip);

	of_gpiochip_remove(chip);

	/*

	/*

	 * We accept no more calls into the driver from this point, so

	 * We accept no more calls into the driver from this point, so