Commit 1c3f69b4 authored by John Garry's avatar John Garry Committed by Marc Zyngier

ACPI: Drop acpi_dev_irqresource_disabled()

The functionality of acpi_dev_irqresource_disabled() is same as in common
irqresource_disabled(), so drop acpi_dev_irqresource_disabled() in favour
of that function.
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/1606905417-183214-4-git-send-email-john.garry@huawei.com
parent 9806731d
...@@ -380,13 +380,6 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity) ...@@ -380,13 +380,6 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity)
} }
EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type); EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type);
static void acpi_dev_irqresource_disabled(struct resource *res, u32 gsi)
{
res->start = gsi;
res->end = gsi;
res->flags = IORESOURCE_IRQ | IORESOURCE_DISABLED | IORESOURCE_UNSET;
}
static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
u8 triggering, u8 polarity, u8 shareable, u8 triggering, u8 polarity, u8 shareable,
bool legacy) bool legacy)
...@@ -394,7 +387,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, ...@@ -394,7 +387,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
int irq, p, t; int irq, p, t;
if (!valid_IRQ(gsi)) { if (!valid_IRQ(gsi)) {
acpi_dev_irqresource_disabled(res, gsi); irqresource_disabled(res, gsi);
return; return;
} }
...@@ -426,7 +419,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, ...@@ -426,7 +419,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
res->start = irq; res->start = irq;
res->end = irq; res->end = irq;
} else { } else {
acpi_dev_irqresource_disabled(res, gsi); irqresource_disabled(res, gsi);
} }
} }
...@@ -463,7 +456,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, ...@@ -463,7 +456,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
*/ */
irq = &ares->data.irq; irq = &ares->data.irq;
if (index >= irq->interrupt_count) { if (index >= irq->interrupt_count) {
acpi_dev_irqresource_disabled(res, 0); irqresource_disabled(res, 0);
return false; return false;
} }
acpi_dev_get_irqresource(res, irq->interrupts[index], acpi_dev_get_irqresource(res, irq->interrupts[index],
...@@ -473,7 +466,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, ...@@ -473,7 +466,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
ext_irq = &ares->data.extended_irq; ext_irq = &ares->data.extended_irq;
if (index >= ext_irq->interrupt_count) { if (index >= ext_irq->interrupt_count) {
acpi_dev_irqresource_disabled(res, 0); irqresource_disabled(res, 0);
return false; return false;
} }
if (is_gsi(ext_irq)) if (is_gsi(ext_irq))
...@@ -481,7 +474,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, ...@@ -481,7 +474,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
ext_irq->triggering, ext_irq->polarity, ext_irq->triggering, ext_irq->polarity,
ext_irq->shareable, false); ext_irq->shareable, false);
else else
acpi_dev_irqresource_disabled(res, 0); irqresource_disabled(res, 0);
break; break;
default: default:
res->flags = 0; res->flags = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment