diff options
author | Maxime Ripard <[email protected]> | 2021-05-27 14:32:13 +0200 |
---|---|---|
committer | Maxime Ripard <[email protected]> | 2021-05-27 14:32:13 +0200 |
commit | ffa52910faff64f2070af42c22d782c4572d889e (patch) | |
tree | 18c103f25a1467d02af1ebf27d7f0a8b177f5825 /drivers/gpio/gpio-tegra186.c | |
parent | 5ccbb2ee039f0bd81e2b34b670718186753a4e17 (diff) | |
parent | 5522e9f7b0fbe2a0cb89c199b574523becc8c3ab (diff) |
Merge drm/drm-next into drm-misc-next
i915 is broken without -rc3, let's bring that tag in to fix it.
Signed-off-by: Maxime Ripard <[email protected]>
Diffstat (limited to 'drivers/gpio/gpio-tegra186.c')
-rw-r--r-- | drivers/gpio/gpio-tegra186.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c index 1bd9e44df718..05974b760796 100644 --- a/drivers/gpio/gpio-tegra186.c +++ b/drivers/gpio/gpio-tegra186.c @@ -444,16 +444,6 @@ static int tegra186_irq_set_wake(struct irq_data *data, unsigned int on) return 0; } -static int tegra186_irq_set_affinity(struct irq_data *data, - const struct cpumask *dest, - bool force) -{ - if (data->parent_data) - return irq_chip_set_affinity_parent(data, dest, force); - - return -EINVAL; -} - static void tegra186_gpio_irq(struct irq_desc *desc) { struct tegra_gpio *gpio = irq_desc_get_handler_data(desc); @@ -700,7 +690,6 @@ static int tegra186_gpio_probe(struct platform_device *pdev) gpio->intc.irq_unmask = tegra186_irq_unmask; gpio->intc.irq_set_type = tegra186_irq_set_type; gpio->intc.irq_set_wake = tegra186_irq_set_wake; - gpio->intc.irq_set_affinity = tegra186_irq_set_affinity; irq = &gpio->gpio.irq; irq->chip = &gpio->intc; |