ACPI/PCI: pci_link: use extended_irq union member when setting ext-irq shareable
PATCH v2 1/1 ACPI/PCI: pci_link: use extended_irq union member when setting ext-irq shareable
The case ACPI_RESOURCE_TYPE_EXTENDED_IRQ inside acpi_pci_link_set() is correctly using resource->res.data.extended_irq.foo for most settings, but for the shareable setting it so far has accidentally been using resource->res.data.irq.shareable instead of resource->res.data.extended_irq.shareable.
Note that the old code happens to also work because the shareable field offset is the same for both the acpi_resource_irq and acpi_resource_extended_irq structs.
---
Changes in v2:
- Fix some spelling errors in the commit message pointed out by Bjorn
- Add Bjorn's Acked-by
--- drivers/acpi/pci_link.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/pci_link.c +2 -2
@@ -322,10 +322,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) resource->res.data.extended_irq.polarity = link->irq.polarity;if (link->irq.triggering ==ACPI_EDGE_SENSITIVE ) - resource->res.data.irq.shareable = + resource->res.data.extended_irq.shareable =ACPI_EXCLUSIVE ;else - resource->res.data.irq.shareable =ACPI_SHARED ; + resource->res.data.extended_irq.shareable =ACPI_SHARED ; resource->res.data.extended_irq.interrupt_count =1 ; resource->res.data.extended_irq.interrupts[0 ] = irq;/* ignore resource_source, it's optional */
Signature · 1 line
2.26.0
Rafael J. Wysocki
AppliedQuoted 28 lines · CEST Hans de Goede
The case
ACPI_RESOURCE_TYPE_EXTENDED_IRQinsideacpi_pci_link_set()is correctly usingresource->res.data.extended_irq.foofor most settings, but for the shareable setting it so far has accidentally been usingresource->res.data.irq.shareableinstead ofresource->res.data.extended_irq.shareable.Note that the old code happens to also work because the shareable field offset is the same for both the
acpi_resource_irqandacpi_resource_extended_irqstructs.Acked-by Bjorn Helgaas <[email protected]>Signed-off-by Hans de Goede <[email protected]>---
Changes in v2:
- Fix some spelling errors in the commit message pointed out by Bjorn
- Add Bjorn's Acked-by--- drivers/acpi/pci_link.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/acpi/pci_link.c +0
-0@@ -322,10 +322,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) resource->res.data.extended_irq.polarity = link->irq.polarity;
drivers/acpi/pci_link.c static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) · line 331
Quoted 10 lines
drivers/acpi/pci_link.c +2
-2if (link->irq.triggering ==ACPI_EDGE_SENSITIVE ) - resource->res.data.irq.shareable = + resource->res.data.extended_irq.shareable =ACPI_EXCLUSIVE ;else - resource->res.data.irq.shareable =ACPI_SHARED ; + resource->res.data.extended_irq.shareable =ACPI_SHARED ; resource->res.data.extended_irq.interrupt_count =1 ; resource->res.data.extended_irq.interrupts[0 ] = irq;/* ignore resource_source, it's optional */
Applied as 5.7-rc material, thanks!