Commit 3bf6f013 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - fix interrupts when replugging the device in gpio-dln2

 - remove the arbitrary timeout on virtio requests from gpio-virtio

* tag 'gpio-fixes-for-v5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: virtio: remove timeout
  gpio: dln2: Fix interrupts when replugging the device
parents 0d81b5fa 3e4d9a48

drivers/gpio/gpio-dln2.c

+9 −10
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
struct dln2_gpio {

	struct platform_device *pdev;

	struct gpio_chip gpio;

	struct irq_chip irqchip;



	/*

	 * Cache pin direction to save us one transfer, since the hardware has
@@ -383,15 +384,6 @@ static void dln2_irq_bus_unlock(struct irq_data *irqd) 
	mutex_unlock(&dln2->irq_lock);

}



static struct irq_chip dln2_gpio_irqchip = {

	.name = "dln2-irq",

	.irq_mask = dln2_irq_mask,

	.irq_unmask = dln2_irq_unmask,

	.irq_set_type = dln2_irq_set_type,

	.irq_bus_lock = dln2_irq_bus_lock,

	.irq_bus_sync_unlock = dln2_irq_bus_unlock,

};



static void dln2_gpio_event(struct platform_device *pdev, u16 echo,

			    const void *data, int len)

{
@@ -473,8 +465,15 @@ static int dln2_gpio_probe(struct platform_device *pdev) 
	dln2->gpio.direction_output = dln2_gpio_direction_output;

	dln2->gpio.set_config = dln2_gpio_set_config;



	dln2->irqchip.name = "dln2-irq",

	dln2->irqchip.irq_mask = dln2_irq_mask,

	dln2->irqchip.irq_unmask = dln2_irq_unmask,

	dln2->irqchip.irq_set_type = dln2_irq_set_type,

	dln2->irqchip.irq_bus_lock = dln2_irq_bus_lock,

	dln2->irqchip.irq_bus_sync_unlock = dln2_irq_bus_unlock,



	girq = &dln2->gpio.irq;

	girq->chip = &dln2_gpio_irqchip;

	girq->chip = &dln2->irqchip;

	/* The event comes from the outside so no parent handler */

	girq->parent_handler = NULL;

	girq->num_parents = 0;

drivers/gpio/gpio-virtio.c

+1 −5
Original line number Diff line number Diff line
@@ -100,11 +100,7 @@ static int _virtio_gpio_req(struct virtio_gpio *vgpio, u16 type, u16 gpio, 
	virtqueue_kick(vgpio->request_vq);

	mutex_unlock(&vgpio->lock);



	if (!wait_for_completion_timeout(&line->completion, HZ)) {

		dev_err(dev, "GPIO operation timed out\n");

		ret = -ETIMEDOUT;

		goto out;

	}

	wait_for_completion(&line->completion);



	if (unlikely(res->status != VIRTIO_GPIO_STATUS_OK)) {

		dev_err(dev, "GPIO request failed: %d\n", gpio);