From: "irqchip-bot for John Garry" <tip-bot2@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: John Garry <john.garry@huawei.com>, Marc Zyngier <maz@kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
tglx@linutronix.de
Subject: [irqchip: irq/irqchip-next] ACPI: Drop acpi_dev_irqresource_disabled()
Date: Fri, 11 Dec 2020 14:58:42 -0000 [thread overview]
Message-ID: <160769872206.3364.573437199198282902.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1606905417-183214-4-git-send-email-john.garry@huawei.com>
The following commit has been merged into the irq/irqchip-next branch of irqchip:
Commit-ID: 1c3f69b4543af0aad514c127298e5ea40392575d
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/1c3f69b4543af0aad514c127298e5ea40392575d
Author: John Garry <john.garry@huawei.com>
AuthorDate: Wed, 02 Dec 2020 18:36:55 +08:00
Committer: Marc Zyngier <maz@kernel.org>
CommitterDate: Fri, 11 Dec 2020 14:47:50
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: John Garry <john.garry@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/1606905417-183214-4-git-send-email-john.garry@huawei.com
---
drivers/acpi/resource.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index ad04824..5820319 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -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;
next prev parent reply other threads:[~2020-12-11 15:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 10:36 [PATCH v5 0/5] Support managed interrupts for platform devices John Garry
2020-12-02 10:36 ` [PATCH v5 1/5] genirq/affinity: Add irq_update_affinity_desc() John Garry
2020-12-11 14:58 ` [irqchip: irq/irqchip-next] " irqchip-bot for John Garry
2020-12-02 10:36 ` [PATCH v5 2/5] resource: Add irqresource_disabled() John Garry
2020-12-11 14:58 ` [irqchip: irq/irqchip-next] " irqchip-bot for John Garry
2020-12-02 10:36 ` [PATCH v5 3/5] ACPI: Drop acpi_dev_irqresource_disabled() John Garry
2020-12-11 14:58 ` irqchip-bot for John Garry [this message]
2020-12-02 10:36 ` [PATCH v5 4/5] Driver core: platform: Add devm_platform_get_irqs_affinity() John Garry
2020-12-09 18:32 ` Greg KH
2020-12-09 19:04 ` John Garry
2020-12-09 19:13 ` Greg KH
2020-12-09 19:36 ` John Garry
2020-12-09 19:39 ` Marc Zyngier
2020-12-10 10:10 ` John Garry
2020-12-10 15:29 ` Greg KH
2020-12-10 16:37 ` John Garry
2020-12-11 14:58 ` [irqchip: irq/irqchip-next] driver " irqchip-bot for John Garry
2020-12-02 10:36 ` [PATCH v5 5/5] scsi: hisi_sas: Expose HW queues for v2 hw John Garry
2020-12-11 16:56 ` John Garry
2020-12-11 17:20 ` Martin K. Petersen
2020-12-11 17:33 ` John Garry
2020-12-11 15:01 ` [PATCH v5 0/5] Support managed interrupts for platform devices Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160769872206.3364.573437199198282902.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=john.garry@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).