From patchwork Thu Nov 17 15:08:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 21730 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp453514wrr; Thu, 17 Nov 2022 07:12:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf6pPwSc3ZHf0RBvqVroi0aEojjamlMYKRNZcjPekGmsJeU4GPT9FGB1Y8SPdAEQM+Ga6bGs X-Received: by 2002:a17:907:a709:b0:79f:cd7c:e861 with SMTP id vw9-20020a170907a70900b0079fcd7ce861mr2421693ejc.339.1668697924557; Thu, 17 Nov 2022 07:12:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668697924; cv=none; d=google.com; s=arc-20160816; b=Cxqiuc7CdfftpwcxvvWMFgJYK1TDXJklWTjS9T4aXhBnDRALzV4foIlGyj7SNmrLth zCcvQb+ANk037HHKf9JxhX5pma7dCiD+heNshumnEBgbSilh8+gGwB7coHXh4D5134mL 9bOBNDIb7E4vJJYLZPshz/LRXhm8rLCxHQuAtTkkt7BlW450QqgGgJGU19s19agseo+N jGdqo0CG5GhmODGYog0JeK/zL0zOOr6Z9I/SRYEmFFEl217CNLIxOhmjiMNXNprDHFQe kGEI2F4+bf+ciB8AZE03OHYUXOgTxoWLNyGzmxCflcGyMRanOjUcJEl4AOxW5VR2c3in 3ggw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=PVoWKIGb6vmjAvnq149933QDV7tjekCdGYfIfsLk9ck=; b=Dk+xJO9ISgQfYdodfZWl/nFzQZtm77khvXF/INKFiU2G5NeAb8pNdYikI3rtCyug3h Ek+szzwWavnMOC8t/g7H7+ArfIzTmCGqUHjeujXYIJqhTPL6Gb9H8ixTbP/iiFo87sY2 CaOFvOmfHxcc7YGh5EMoS2ZL1XBvzH3kBQHM2K6ZwoEFLfhvG67v5RtzR0tNhQKhCOWd nX2opbL2veKFiml9sWWnb4PGfsOYOYtowiU858CtXP2c4LWqcFeANsm/cY9uCu3Q0nUa XqT9J7x5DOpy1RySKuyZsKEoWaoAPQXmeURqQfJL1zXYJ3CrCIDEzeOwU0h0Bc3AfgXn 9/uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FxtwRxeD; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=luseQRVY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p13-20020a05640210cd00b00461a144e981si858753edu.356.2022.11.17.07.11.34; Thu, 17 Nov 2022 07:12:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FxtwRxeD; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=luseQRVY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240467AbiKQPKx (ORCPT + 99 others); Thu, 17 Nov 2022 10:10:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240293AbiKQPJ1 (ORCPT ); Thu, 17 Nov 2022 10:09:27 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98E5EB63; Thu, 17 Nov 2022 07:08:25 -0800 (PST) Date: Thu, 17 Nov 2022 15:08:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1668697704; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PVoWKIGb6vmjAvnq149933QDV7tjekCdGYfIfsLk9ck=; b=FxtwRxeDUnGKG5AkGaL35xKR19LvlUDeI1e15SKNfMPcB4i3ipmo/y/pBDN/xDNLCP5VAh lX9S50sufxK8AetoSuWh1sk+TrWZg9Pnidet5OZtMGuO4c0GVIaSzv4zPaDXErj4k/I+c8 2QOrhaxB4eS51JZQHzeGdYjm3pBzCEM2dJgA9xKie8RL/cO0rnMXtUVtwoo3kOG9DnI7gd a4WTplStY0o/hMJ9oQkA/Jp+apLSbAZKvTY0ADjZOwHBaGB6fnrA5bwhpL6UTyaA88bhMV +wUBkbAnqRAWeHB8XsGRTPebr3H30TraXGTPtGCoDD/phFHc9n6GUbLptmrbdA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1668697704; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PVoWKIGb6vmjAvnq149933QDV7tjekCdGYfIfsLk9ck=; b=luseQRVY/F8cl8lUJTIY+tfhVZ9VFvsNF9OhONrmbFQcu5xrO1rBb9lE1tDSRxZeCQkC6s /ma+FftRcAqdksBQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] genirq/msi: Make __msi_domain_free_irqs() static Cc: Thomas Gleixner , Ashok Raj , Jason Gunthorpe , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20221111122014.179595843@linutronix.de> References: <20221111122014.179595843@linutronix.de> MIME-Version: 1.0 Message-ID: <166869770303.4906.13442736094650418814.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749208281547726358?= X-GMAIL-MSGID: =?utf-8?q?1749756594495355837?= The following commit has been merged into the irq/core branch of tip: Commit-ID: 057c97a1cd665ebb38841418adcd35f57b33cc21 Gitweb: https://git.kernel.org/tip/057c97a1cd665ebb38841418adcd35f57b33cc21 Author: Thomas Gleixner AuthorDate: Fri, 11 Nov 2022 14:54:30 +01:00 Committer: Thomas Gleixner CommitterDate: Thu, 17 Nov 2022 15:15:19 +01:00 genirq/msi: Make __msi_domain_free_irqs() static Now that the last user is gone, confine it to the core code. Signed-off-by: Thomas Gleixner Reviewed-by: Ashok Raj Reviewed-by: Jason Gunthorpe Link: https://lore.kernel.org/r/20221111122014.179595843@linutronix.de --- include/linux/msi.h | 4 ---- kernel/irq/msi.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/linux/msi.h b/include/linux/msi.h index 7f6aba9..ee735ff 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -335,9 +335,6 @@ struct msi_domain_info; * are set to the default implementation if NULL and even when * MSI_FLAG_USE_DEF_DOM_OPS is not set to avoid breaking existing users and * because these callbacks are obviously mandatory. - * - * __msi_domain_free_irqs() is exposed for PPC pseries to handle extra - * work after all interrupts and descriptors have been freed. */ struct msi_domain_ops { irq_hw_number_t (*get_hwirq)(struct msi_domain_info *info, @@ -432,7 +429,6 @@ int msi_domain_alloc_irqs_descs_locked(struct irq_domain *domain, struct device int nvec); int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, int nvec); -void __msi_domain_free_irqs(struct irq_domain *domain, struct device *dev); void msi_domain_free_irqs_descs_locked(struct irq_domain *domain, struct device *dev); void msi_domain_free_irqs(struct irq_domain *domain, struct device *dev); struct msi_domain_info *msi_get_domain_info(struct irq_domain *domain); diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index c71c37d..a2efa00 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -463,6 +463,7 @@ static inline void msi_sysfs_remove_desc(struct device *dev, struct msi_desc *de #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN static int __msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, int nvec); +static void __msi_domain_free_irqs(struct irq_domain *domain, struct device *dev); static inline void irq_chip_write_msi_msg(struct irq_data *data, struct msi_msg *msg) @@ -978,7 +979,7 @@ int msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev, int nve return ret; } -void __msi_domain_free_irqs(struct irq_domain *domain, struct device *dev) +static void __msi_domain_free_irqs(struct irq_domain *domain, struct device *dev) { struct msi_domain_info *info = domain->host_data; struct irq_data *irqd;