From patchwork Mon Nov 30 17:35:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 334720 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp4896731ilb; Mon, 30 Nov 2020 09:41:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjsgce/K6YNVjZ1meYeu1BqLKsNjV8J9uGXu7se2OEq2XkSadyOd77SCrAIG8BBm72ahl1 X-Received: by 2002:a2e:9114:: with SMTP id m20mr2644499ljg.72.1606758117744; Mon, 30 Nov 2020 09:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606758117; cv=none; d=google.com; s=arc-20160816; b=qu70tTD9bhtUDvCGtnO25hsDKtKePm3OfVJi2Lj9EZXOQi2v0UHap00txeLzQ7rFNl EpB9aFlsy1MyJWiok+qAm8taOwAbaUJSsJN5e9KRbYSaZxk9QjnHrXbOYTzT94ZenWc7 +DlKx+6X1zJ5EiH8NbPQTvvPhBd9u9CVDuajOeUKWrhB0TSfM4u4W1HazsvbjnCp1Syl FD6u8Rr6rJpBozrY5DHV7jnFkbSaSQwJD/5nV8XTfYn21pPY/a0Xf72mKdeT0uYvSpW9 sNgaIqS5eS1GSMPmuqHUmPMY09BxoKd6PNIiLfXPFpGk1i2QK2uzUEviUQ1VVknfJT2q AtGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=kl9PSxPTKAD3TrxvXA9Mi/wR1H5K0YASbZGXiSx3uUo=; b=0m69jOCEA84Sq6qtFQofAh73FCuoN/fMVqPeStK7T7AAfG3OOEyYpYTxI0tD1IwgnM avARIAJUc5LBbb7BAFN4PROJq/DJTeffV28Oav4jgXXkHei/tzo8ZI9/h0BTDnbWBqSI 3jFuFYDdZBRpB2FZHfT/Bx5vBPFUPtMralT0aN2tHbXcZurzsbp+7+ZyWnpS/tQGXa71 CjI+RXncuyeVjJ7PZrD4ufPjiPjYd76h94uZC+w2fg68DxK4VBQhn5wFP6L59B5fTicI fehSRbutKg61EPTINY31/APxuhEwstK1KA9rRrJaT8jipXIzj3y2aswSC8jLdjHGfI0A nUYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b27si11520228eje.466.2020.11.30.09.41.57 for ; Mon, 30 Nov 2020 09:41:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387771AbgK3Rkw (ORCPT ); Mon, 30 Nov 2020 12:40:52 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:8221 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729502AbgK3Rku (ORCPT ); Mon, 30 Nov 2020 12:40:50 -0500 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4ClCCf5mLVzkjgD; Tue, 1 Dec 2020 01:39:26 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.487.0; Tue, 1 Dec 2020 01:39:50 +0800 From: John Garry To: , , , , , , CC: , , , , , "John Garry" Subject: [PATCH v4 3/5] ACPI: Drop acpi_dev_irqresource_disabled() Date: Tue, 1 Dec 2020 01:35:57 +0800 Message-ID: <1606757759-6076-4-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1606757759-6076-1-git-send-email-john.garry@huawei.com> References: <1606757759-6076-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org 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 --- drivers/acpi/resource.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) -- 2.26.2 Acked-by: Rafael J. Wysocki diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index ad04824ca3ba..58203193417e 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;