From patchwork Mon Mar 11 11:53:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keguang Zhang X-Patchwork-Id: 13588695 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 B556BC5475B for ; Mon, 11 Mar 2024 11:54:29 +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=K/+vGjIx+u88+tcIF5ca+n+LdA+2cF5zohMT6LC1elo=; b=MGWeHkNaFSk7RR vCuJw3CxSvf7kXe7qxLlhcaljk3P2nILybJPaJV4PUZ4dtjro1eekLh2oH7M2ZSxtvMm5K9q3qtd0 lYbBLWdfeB6bCstEtNiGHJeXo665W8beAY/xrFvfzM9GmEeK7FQTTSb26DM9FMN+yI9Dgk4vJiPSc XR7WGwVHf7eEhLMSOe7jb6kHGlR2Vg8rN7nLiKUrbag4JTsjBRXCS08kIQDXfoTHY2ubEsCaSe1Zw LTfXmcyJyiNeZGbgorpbK/A/DVSbq+a4fXdQhL7sl2BG913DYh8ZBIUFmFcCHTZstJ7FYmjGsj/c7 zbd3lPEmW1czzK0U69Qg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rjeEP-00000001Mjo-36v6; Mon, 11 Mar 2024 11:54:13 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rjeEM-00000001Mi1-0y0C for linux-arm-kernel@lists.infradead.org; Mon, 11 Mar 2024 11:54:12 +0000 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1dd7df835a8so15940935ad.1 for ; Mon, 11 Mar 2024 04:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710158043; x=1710762843; 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=UPNazQlGmkQf9hVivO3Ny38z32q6y/PMgomiFB9Ohpo=; b=ICeomTUMLwZB5cMAo0CcjGmHPIl2KSYtDNSplg9qot30eX50GqDq2esX3obBXYCox4 TfBL6dHfjN1dkDO0YERSGQrplBGM2BUQUTkaApYpuxUk19xzwTexlOYA4NAENqPRcEl7 zJPJwEETkNPQjGMdLpGS/v56ZLH2QS3pg5T4z4w0OuqERETuFI0EQiaoE2TA0tu7Azfk 3WBvJAad/lopHI628DY3Ns6HfhEdXTwLQmFj9KqvfmOO8aus6LAficzwzW9LcoXFR17h iyqkD5wyyXBg1k02BHrf+rmzMfT/I0GFfARIZ4bsGfFb8zwrmvGAdhmMWmGHJeIvC8Bw FyNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710158043; x=1710762843; 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=UPNazQlGmkQf9hVivO3Ny38z32q6y/PMgomiFB9Ohpo=; b=hbma3RZCVq7+YF4MIrzWVwzPAz2G+pZpekZzjmio5kNPIWSe5Nhkf4QUyG+tA36V6l xD/7oLopYeASF3iNs64dcKnVGD/cqNNrEp/cz+vKQ9man/Tf5AnYAzKxRkETBt/HBv4g xidQT16vxqfegmBM04eQ+5TL4Q0hC3YNAXr9jsK+LitF3+DrZNhOB3YQ1BwtNAJ0ReTZ BWvDwAAS59MMYMh/RqGPZoKZ5RIame3kEjzYBEdxuhl+wEtng3Y5mdieQUF9EZ9gTTf4 wi0QzOsS4g+mL/cPRiJG4OxY/qU7LKno/WT15nNLzvxLCIlrLIT22sq6jScLtqAgp2Dp nicQ== X-Forwarded-Encrypted: i=1; AJvYcCXvb/sMefIFAPHbHuyUe0LCYBkg4p1TLX5aAoO3IN6M+DCxnBBxCIrMj/8GcVmzr8wGXSzYrm6uGzcRtcpbTKJDTq/Y17q3fNblyjfkJq+Vzu6qHBs= X-Gm-Message-State: AOJu0Yz8C+SlLhX+5ki8OL9ETubO28JKy3Pfmhw1kj9n4toqdRP+Wk7T TihoEFx+gLC5aco+AtlUvkeAv90YxOHmkIaqpZ2DeEXaGUmZ70en X-Google-Smtp-Source: AGHT+IEaq9G5ibgjW5cuECRa2zEfUpHa4myqNxMYTPShI90FZx5rwodmCZG0vXfcmR9ZorJexVL7ew== X-Received: by 2002:a17:902:ec87:b0:1dd:96de:83c3 with SMTP id x7-20020a170902ec8700b001dd96de83c3mr4092124plg.11.1710158043030; Mon, 11 Mar 2024 04:54:03 -0700 (PDT) Received: from kelvin-ThinkPad-L14-Gen-1.lan ([203.145.41.11]) by smtp.gmail.com with ESMTPSA id x8-20020a170902a38800b001dd6958833esm4627682pla.242.2024.03.11.04.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 04:54:02 -0700 (PDT) From: Keguang Zhang To: Thomas Gleixner , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Keguang Zhang Subject: [PATCH RESEND] irqchip: Drop the custom fixes for the same irq_chip name Date: Mon, 11 Mar 2024 19:53:44 +0800 Message-Id: <20240311115344.72567-1-keguang.zhang@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240311_045410_318536_9A2B152A X-CRM114-Status: GOOD ( 11.26 ) 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. Acked-by: Jernej Skrabec Signed-off-by: Keguang Zhang --- drivers/irqchip/irq-sunxi-nmi.c | 1 - drivers/irqchip/irq-tb10x.c | 1 - 2 files changed, 2 deletions(-) base-commit: 8ffc8b1bbd505e27e2c8439d326b6059c906c9dd 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;