Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3E94C64ED8 for ; Fri, 24 Feb 2023 20:00:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229814AbjBXUAd (ORCPT ); Fri, 24 Feb 2023 15:00:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229532AbjBXUAa (ORCPT ); Fri, 24 Feb 2023 15:00:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCF453757D; Fri, 24 Feb 2023 11:59:57 -0800 (PST) Date: Fri, 24 Feb 2023 19:59:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1677268795; 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=+QDv5nRWs6ZjIbRaVD5ljmBiyofZxQMMwPgAc7wVGTs=; b=g9kMLqjmHdcTN3c6Gza+NM8qDC7FaVtkkijjP35RnHBMOLRYguqGhzlNk40FyoZ1i4Rr9E rML7zG9RldqURWNqWkaK+nhTfE2n5XeZeXQzei5IVrrk42tf9meJYtNSu/nGjW0z7rQLHI djjgoLMO674OXKqeJJr9CAJtBSGep/82MWl+jODzP5PzDFeU3nPNhYXVnJdcE8LVLdd5Vr hAQ2ML0QW/APSnT4cJBIM/FdvKfvqTVzK0sgJpDcSKAIY6MD4sc2e1vt8E8xnZ8INLbuEf BS6h67gq6GOhRh+gHtHMrCD6iktJQ9EmtkRgWGpihPcMv3RVDGmjjUPsx2PuPw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1677268795; 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=+QDv5nRWs6ZjIbRaVD5ljmBiyofZxQMMwPgAc7wVGTs=; b=fDxbicN7KytEspVSAAHtjG8ejcQHRjKWm4agj+Y7I68Smu9XADePez/PoYvX222eijC0LB ioorswgWhp4eh/BA== From: "tip-bot2 for Johan Hovold" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/urgent] genirq/msi: Drop dead domain name assignment Cc: Johan Hovold , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20230224130509.27814-1-johan+linaro@kernel.org> References: <20230224130509.27814-1-johan+linaro@kernel.org> MIME-Version: 1.0 Message-ID: <167726879502.5837.7389254031515212648.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/urgent branch of tip: Commit-ID: ea9a78c3a7a44e36fa690e1cc90dc2a758c8eb9a Gitweb: https://git.kernel.org/tip/ea9a78c3a7a44e36fa690e1cc90dc2a758c8eb9a Author: Johan Hovold AuthorDate: Fri, 24 Feb 2023 14:05:09 +01:00 Committer: Thomas Gleixner CommitterDate: Fri, 24 Feb 2023 20:54:58 +01:00 genirq/msi: Drop dead domain name assignment Since commit d59f6617eef0 ("genirq: Allow fwnode to carry name information only") an IRQ domain is always given a name during allocation (e.g. used for the debugfs entry). Drop the unused fallback name assignment when creating MSI domains. Signed-off-by: Johan Hovold Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230224130509.27814-1-johan+linaro@kernel.org --- kernel/irq/msi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 13d9649..efd21b7 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -830,11 +830,8 @@ static struct irq_domain *__msi_create_irq_domain(struct fwnode_handle *fwnode, domain = irq_domain_create_hierarchy(parent, flags | IRQ_DOMAIN_FLAG_MSI, 0, fwnode, &msi_domain_ops, info); - if (domain) { - if (!domain->name && info->chip) - domain->name = info->chip->name; + if (domain) irq_domain_update_bus_token(domain, info->bus_token); - } return domain; }