From patchwork Tue Oct 17 12:27:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keguang Zhang X-Patchwork-Id: 13425084 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 27244CDB474 for ; Tue, 17 Oct 2023 12:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=inu7Xb87+yg1kCe1SA3eWoK3tbVSXp5SapQXXyf7dII=; b=C4nP6iXoXDOwkG cK1rZertP73vJFJhq3swKVQiWjxIBwdiMxrfe7afN/uoeSooQOFdizBJXl/iRCGSGZvoLUUPLmqLp 8iJ4iC3olw/ZZZ/NEDO1CJZXa7R0hFdGj5F3bVSbK4JNpiv42FnZaEEhcy8lMZpyxvKsWyGG5VpZ5 yVMNaCRpVDpX2ul1gDvbtveTlPiEiQs/DxxH1EFcY2AkHqKciY/e1uTvSBtuwHgb73Nu7ittA/R5e rOoXZNeT/taW5NzFwYQgAKA+pLfOiZX9wTnbQQCPe+C9XO4H2F8X5nIhp1nAaKbJxlOFzLvwLpjom izKpbAja3Uw7YkHTu5CQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qsjB1-00CIdv-1S; Tue, 17 Oct 2023 12:27:59 +0000 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qsjAz-00CIdD-14 for linux-arm-kernel@lists.infradead.org; Tue, 17 Oct 2023 12:27:58 +0000 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-5ab94fc098cso2182539a12.1 for ; Tue, 17 Oct 2023 05:27:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697545673; x=1698150473; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oIvH93b/sWVIbaT25hdzz+hqN4HWpQnfh8o78oWByr4=; b=F97pKnghNCzlPv3RwOcKPAVbCZxb6Xs7zwr3NWR6eEsTmVHRvXPI1ZBdNM8Z6OsAhn Bwf62I/9WdmvLvXiGwTRISneHSVoM2txhFaPwFm3oKvihAYS4qP1822FlECd4TykjtG0 Mow/9LOTI0NuAwBm5I9w0Y3X7VaIyLgry2GXgw7ESlKbVH6kW2dR2sY93+d5uKeaP3gb it1P3/IrVY50b8mJDSIMvvm7Csc1pxsPf2rWaXjtePZ9cEPc7c9Yca/Al+cywJ7+yY1K rB10qPKKth9wpbPPBNN1UL3o6cboej7pgcqf24aZSbCjwRPdIhraj3VRkb7JUh5cU1Og keEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697545673; x=1698150473; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oIvH93b/sWVIbaT25hdzz+hqN4HWpQnfh8o78oWByr4=; b=GOT7ElpdqiFUIJJxvaBVsghUA8MGOLkSu57w+XE8/oms9olVt80ikdtVhNHdyY/pkq h8qJzu4+faENlxHIlIUkMSpKXaTrqz2DjJWyV3qtqzYpgvyjEvJAyjj6fgufRKuwMBTj hRDS7mCOU1bUFO0vbjZq286AL1vb1GC20FqtxcGEFYcaunqXR1jkYD/qWTrOt9hJB5uo dUhMD3as2ZKuJkNEN+VTtlepmDMfRw+kA7KENwy989LYIO/kVR4VXt/kxKvMeDS0+VhU aRm8fDSNWUeHCvCUj+P7xRahb8f76EAjK119vQbUO1d/qJ2byxsExU8Bj8ZdoQxLsxso C/qw== X-Gm-Message-State: AOJu0YwNiM3Ka3M4p6sBk/eJnCuEqpXbpMp5zPzxR29swnhdS5jXLybf D/vLr+cleqzkeoeZisUnyBM= X-Google-Smtp-Source: AGHT+IFSw8FIVjPWtqi/0et1umJtbVLACgN66JMBmJenEXVUlttevscGPjWw9ZWjgpb3vwv9ZAN8/Q== X-Received: by 2002:a05:6a21:1a5:b0:154:d3ac:2076 with SMTP id le37-20020a056a2101a500b00154d3ac2076mr2166222pzb.40.1697545672936; Tue, 17 Oct 2023 05:27:52 -0700 (PDT) Received: from kelvin-System-Product-Name.lan ([112.45.97.252]) by smtp.gmail.com with ESMTPSA id l18-20020a170902d35200b001c9d235b3a0sm1406193plk.7.2023.10.17.05.27.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 05:27:52 -0700 (PDT) From: Keguang Zhang To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Cc: Thomas Gleixner , Marc Zyngier , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Keguang Zhang Subject: [PATCH] irqchip: Drop the custom fixes for the same irq_chip name Date: Tue, 17 Oct 2023 20:27:18 +0800 Message-Id: <20231017122718.5062-1-keguang.zhang@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231017_052757_367461_77F06D07 X-CRM114-Status: GOOD ( 11.16 ) 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 Since commit 021a8ca2ba23 ("genirq/generic-chip: Fix the irq_chip name for /proc/interrupts "), the chip name of all chip types are set to the same name by irq_init_generic_chip() now. Those custom fixes for the same irq_chip name are no longer needed. So drop them. Signed-off-by: Keguang Zhang Acked-by: Jernej Skrabec --- drivers/irqchip/irq-sunxi-nmi.c | 1 - drivers/irqchip/irq-tb10x.c | 1 - 2 files changed, 2 deletions(-) base-commit: 4d0515b235dec789578d135a5db586b25c5870cb diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index e760b1278143..bb92fd85e975 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c @@ -192,7 +192,6 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node, gc->chip_types[0].regs.type = reg_offs->ctrl; gc->chip_types[1].type = IRQ_TYPE_EDGE_BOTH; - gc->chip_types[1].chip.name = gc->chip_types[0].chip.name; gc->chip_types[1].chip.irq_ack = irq_gc_ack_set_bit; gc->chip_types[1].chip.irq_mask = irq_gc_mask_clr_bit; gc->chip_types[1].chip.irq_unmask = irq_gc_mask_set_bit; diff --git a/drivers/irqchip/irq-tb10x.c b/drivers/irqchip/irq-tb10x.c index 680586354d12..d59bfbe8c6d0 100644 --- a/drivers/irqchip/irq-tb10x.c +++ b/drivers/irqchip/irq-tb10x.c @@ -150,7 +150,6 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, gc->chip_types[0].regs.mask = AB_IRQCTL_INT_ENABLE; gc->chip_types[1].type = IRQ_TYPE_EDGE_BOTH; - gc->chip_types[1].chip.name = gc->chip_types[0].chip.name; gc->chip_types[1].chip.irq_ack = irq_gc_ack_set_bit; gc->chip_types[1].chip.irq_mask = irq_gc_mask_clr_bit; gc->chip_types[1].chip.irq_unmask = irq_gc_mask_set_bit;