From patchwork Mon Jul 15 10:51:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 13733312 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3240EC3DA5D for ; Mon, 15 Jul 2024 10:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IvFMFwVCTdsuq558qzjvMcOKbSRd6XpipcLVKrbFDNI=; b=p8+OTc4yJ6tK9qdscRuT8OHPso iPYbBB+rZDnXZ5XmA0tLShvUbFdIWaAg/y3OXOKjx+iGyg3cYvxp6IaPuLb5HJNI0C+oQAWWQVY7Q OWyNgZGu6Sv1BhVjsAFRs0pxONBR5KxCcrACLfXhBh2QEPGqA2z1C0g4K15YKqNfBzL3Lq0BOzyDb R39eXqOdyYqikyLLMfkkCWjpgk4tkwaQfO8AbBIcAd1iRdZrxlTqWTVOE83oO6rNx5Q2/myhyzyYi e+xrtHT6WH7ix9cogKUOLmid4SfC/8WFt3nKmEAdggaPfb4Dco+Wt2Xu0mx9q3Z2FzYhlsUeZdvei loqr1ynw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTJKT-00000006lfu-3s1R; Mon, 15 Jul 2024 10:53:13 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTJJW-00000006lM2-0spT for linux-arm-kernel@lists.infradead.org; Mon, 15 Jul 2024 10:52:15 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 6DEF9CE0EEA; Mon, 15 Jul 2024 10:52:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BEFAC32782; Mon, 15 Jul 2024 10:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721040731; bh=azjt/DjcGUh12b84Mg94z/aFk2FQTq9D7aVgvoC0XG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uRGIstcmLrr2EnJFx0Ad7inOE5/iA+ktHhmLbwDP+p18T/UgckRurLgTFYiK6HZx9 vky6S8kibnhMYuoxdstQLj8N7WWkegSvTR2W2PVV8wHSSA2cTcgIhGTWBAnqfbIYaw JG03APjnEnPrTyNFUjXlr28UQNCeomYMf/SlwikKwzunIaqzqnS/oR0Ho4WnNZbKUa rceoLGjROKpSJ+PYlbbsF+mJWu6LicLgtSRcSZpNsT32eo6I0FE8yOofKSWWbPie/d DyFdWWjRO1yaKhOU5QtvXwT5SS9JRev3mu3W9+FK8DR8Qpu7rkBeetED9idL+r6gSO 0GeeUWbAb/Ojw== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, arm@kernel.org, Andy Shevchenko , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH 03/13] irqchip/armada-370-xp: Rename struct irq_domain variables for consistency Date: Mon, 15 Jul 2024 12:51:46 +0200 Message-ID: <20240715105156.18388-4-kabel@kernel.org> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240715105156.18388-1-kabel@kernel.org> References: <20240715105156.18388-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240715_035214_629575_7BA8AE20 X-CRM114-Status: GOOD ( 12.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rename struct irq_domain variables passed as arguments into callbacks to "h", for consistency. The "d" name is reserved for irq_data, while "domain" is unnecessarily long. Signed-off-by: Marek Behún --- drivers/irqchip/irq-armada-370-xp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 590f08b9dbf7..1739bf768696 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -268,7 +268,7 @@ static struct irq_chip mpic_msi_bottom_irq_chip = { .irq_set_affinity = mpic_msi_set_affinity, }; -static int mpic_msi_alloc(struct irq_domain *domain, unsigned int virq, +static int mpic_msi_alloc(struct irq_domain *h, unsigned int virq, unsigned int nr_irqs, void *args) { int hwirq; @@ -282,18 +282,18 @@ static int mpic_msi_alloc(struct irq_domain *domain, unsigned int virq, return -ENOSPC; for (unsigned int i = 0; i < nr_irqs; i++) - irq_domain_set_info(domain, virq + i, hwirq + i, + irq_domain_set_info(h, virq + i, hwirq + i, &mpic_msi_bottom_irq_chip, - domain->host_data, handle_simple_irq, + h->host_data, handle_simple_irq, NULL, NULL); return 0; } -static void mpic_msi_free(struct irq_domain *domain, unsigned int virq, +static void mpic_msi_free(struct irq_domain *h, unsigned int virq, unsigned int nr_irqs) { - struct irq_data *d = irq_domain_get_irq_data(domain, virq); + struct irq_data *d = irq_domain_get_irq_data(h, virq); mutex_lock(&msi_used_lock); bitmap_release_region(msi_used, d->hwirq, order_base_2(nr_irqs)); @@ -426,20 +426,20 @@ static struct irq_chip mpic_ipi_irqchip = { .ipi_send_mask = mpic_ipi_send_mask, }; -static int mpic_ipi_alloc(struct irq_domain *d, unsigned int virq, +static int mpic_ipi_alloc(struct irq_domain *h, unsigned int virq, unsigned int nr_irqs, void *args) { for (unsigned int i = 0; i < nr_irqs; i++) { irq_set_percpu_devid(virq + i); - irq_domain_set_info(d, virq + i, i, &mpic_ipi_irqchip, - d->host_data, handle_percpu_devid_irq, + irq_domain_set_info(h, virq + i, i, &mpic_ipi_irqchip, + h->host_data, handle_percpu_devid_irq, NULL, NULL); } return 0; } -static void mpic_ipi_free(struct irq_domain *d, unsigned int virq, +static void mpic_ipi_free(struct irq_domain *h, unsigned int virq, unsigned int nr_irqs) { /* Not freeing IPIs */