From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date: Tue, 12 Nov 2019 15:30:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'driver-core/driver-core-next' into gpio/for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a6e191963f3b367c769d5231e0f3870ed981c6c4;p=linux.git

Merge remote-tracking branch 'driver-core/driver-core-next' into gpio/for-next
---

a6e191963f3b367c769d5231e0f3870ed981c6c4
diff --cc drivers/gpio/gpio-tegra186.c
index 57185b96c1105,ef40fbe923cf3..934ab36058491
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@@ -449,8 -407,6 +449,7 @@@ static int tegra186_gpio_probe(struct p
  	unsigned int i, j, offset;
  	struct gpio_irq_chip *irq;
  	struct tegra_gpio *gpio;
 +	struct device_node *np;
- 	struct resource *res;
  	char **names;
  	int err;