Skip to content

Commit e8085a0

Browse files
committed
Merge tag 'gpio-fixes-for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski: - add missing MODULE_DEVICE_TABLE in gpio-cadence - fix a kernel doc validator error in gpio-xilinx - don't set parent IRQ affinity in gpio-tegra186 * tag 'gpio-fixes-for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: tegra186: Don't set parent IRQ affinity gpio: xilinx: Correct kernel doc for xgpio_probe() gpio: cadence: Add missing MODULE_DEVICE_TABLE
2 parents 011ff61 + bdbe871 commit e8085a0

3 files changed

Lines changed: 2 additions & 12 deletions

File tree

drivers/gpio/gpio-cadence.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ static const struct of_device_id cdns_of_ids[] = {
278278
{ .compatible = "cdns,gpio-r1p02" },
279279
{ /* sentinel */ },
280280
};
281+
MODULE_DEVICE_TABLE(of, cdns_of_ids);
281282

282283
static struct platform_driver cdns_gpio_driver = {
283284
.driver = {

drivers/gpio/gpio-tegra186.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -444,16 +444,6 @@ static int tegra186_irq_set_wake(struct irq_data *data, unsigned int on)
444444
return 0;
445445
}
446446

447-
static int tegra186_irq_set_affinity(struct irq_data *data,
448-
const struct cpumask *dest,
449-
bool force)
450-
{
451-
if (data->parent_data)
452-
return irq_chip_set_affinity_parent(data, dest, force);
453-
454-
return -EINVAL;
455-
}
456-
457447
static void tegra186_gpio_irq(struct irq_desc *desc)
458448
{
459449
struct tegra_gpio *gpio = irq_desc_get_handler_data(desc);
@@ -700,7 +690,6 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
700690
gpio->intc.irq_unmask = tegra186_irq_unmask;
701691
gpio->intc.irq_set_type = tegra186_irq_set_type;
702692
gpio->intc.irq_set_wake = tegra186_irq_set_wake;
703-
gpio->intc.irq_set_affinity = tegra186_irq_set_affinity;
704693

705694
irq = &gpio->gpio.irq;
706695
irq->chip = &gpio->intc;

drivers/gpio/gpio-xilinx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ static void xgpio_irqhandler(struct irq_desc *desc)
542542
}
543543

544544
/**
545-
* xgpio_of_probe - Probe method for the GPIO device.
545+
* xgpio_probe - Probe method for the GPIO device.
546546
* @pdev: pointer to the platform device
547547
*
548548
* Return:

0 commit comments

Comments
 (0)