Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26b2bc9b authored by John Garry's avatar John Garry Committed by Greg Kroah-Hartman
Browse files

ACPI: Drop acpi_dev_irqresource_disabled() 



[ Upstream commit 1c3f69b4543af0aad514c127298e5ea40392575d ]

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


Stable-dep-of: c1ed72171ed5 ("ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CBA")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 583913b1

drivers/acpi/resource.c

+5 −12
Original line number Diff line number Diff line
@@ -380,13 +380,6 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity) 
}

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,

				     u8 triggering, u8 polarity, u8 shareable,

				     bool legacy)
@@ -394,7 +387,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, 
	int irq, p, t;



	if (!valid_IRQ(gsi)) {

		acpi_dev_irqresource_disabled(res, gsi);

		irqresource_disabled(res, gsi);

		return;

	}
@@ -426,7 +419,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, 
		res->start = irq;

		res->end = irq;

	} 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, 
		 */

		irq = &ares->data.irq;

		if (index >= irq->interrupt_count) {

			acpi_dev_irqresource_disabled(res, 0);

			irqresource_disabled(res, 0);

			return false;

		}

		acpi_dev_get_irqresource(res, irq->interrupts[index],
@@ -473,7 +466,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, 
	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:

		ext_irq = &ares->data.extended_irq;

		if (index >= ext_irq->interrupt_count) {

			acpi_dev_irqresource_disabled(res, 0);

			irqresource_disabled(res, 0);

			return false;

		}

		if (is_gsi(ext_irq))
@@ -481,7 +474,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index, 
					 ext_irq->triggering, ext_irq->polarity,

					 ext_irq->shareable, false);

		else

			acpi_dev_irqresource_disabled(res, 0);

			irqresource_disabled(res, 0);

		break;

	default:

		res->flags = 0;