From patchwork Wed Feb 26 08:52:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13991845 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 1BAFDC19776 for ; Wed, 26 Feb 2025 09:23:07 +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: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OYB5t7xEtlu/0bhEyUN8lRW8EeBcCOOMR0Pewr32l8I=; b=XokigBOKaXlndI+6c/Qq3VJGfV H4czUgnxzkzxG2g37EEOYKVg9X9VzyLSU21vMWTcy6Zrz9y+2sWNpLBZA93N9rKZuyNsZIHjKhg3K /WOTydHaF1WG5epvCHFMXCzAw18yMae0zvHHsqEg4W60Sp+AJjlhWtQ7XAR8xUlbVXcwF5WlHgq6z 5Fw5FbVF2M2TWctuSQvwEbZPsLJsvrSZQ7XzqgW74zbbIvjnix9zYTWMmjmEHI/CoGsQ1H/wrwQ3i F0osJlDyProXEhYSMdKdH/ikwYimNzIFuP8P9sN1rr9jHTlYiZBoVix6kkyAOWzA7OoF0Zkb5Njm2 BhrTeGKQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tnDd2-000000033px-2BPI; Wed, 26 Feb 2025 09:22:56 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tnD9R-00000002xzK-2LOO for linux-arm-kernel@lists.infradead.org; Wed, 26 Feb 2025 08:52:22 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 575815C48B3; Wed, 26 Feb 2025 08:51:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A407C4CEEB; Wed, 26 Feb 2025 08:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740559939; bh=+/YStbRSbQvqWX6FrcGaK/ABRAx1YiR43FPrBdwUogA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=obSQ4zZMoM8f9+kp4aNKpG6+JTwjXkDNI0nA/ytLMbN1jFMvVMr3+XdGSPen/MgWz WSQ/3zxkwzlQDzUji0uXc9hQcrcoBYMHTZB7EiNUCgiev4sjJgYQTE0MANghEqFclP zbtsxY6Yfkl7yBA1qgifrM8WOjC63qmGk8Z+Kw6pi2n1qIIWMl1EGDTP2Wr7JQ7tk6 p+PWqsycEKxoaGq4VzsJ1bwwZlVEZ9d58WoVNK7XJ0nr4kMstZy0Dzmh6sPdbS714m osgJDWAqYTrSioMBQASj/KBYZWOMnw8ABGvUORxbzj4OwAtUSBl4Fl+0Z3nwAJkAS4 0nUj0Y7iC5tMw== From: Philipp Stanner To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Huacai Chen , Yanteng Si , Yinggang Gu , Feiyang Chen , Philipp Stanner , Jiaxun Yang , Qing Zhang Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Philipp Stanner , stable@vger.kernel.org, Andrew Lunn , Henry Chen Subject: [PATCH net-next v4 1/4] stmmac: loongson: Pass correct arg to PCI function Date: Wed, 26 Feb 2025 09:52:05 +0100 Message-ID: <20250226085208.97891-2-phasta@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250226085208.97891-1-phasta@kernel.org> References: <20250226085208.97891-1-phasta@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250226_005221_653005_207BEEB4 X-CRM114-Status: GOOD ( 13.94 ) 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 pcim_iomap_regions() should receive the driver's name as its third parameter, not the PCI device's name. Define the driver name with a macro and use it at the appropriate places, including pcim_iomap_regions(). Cc: stable@vger.kernel.org # v5.14+ Fixes: 30bba69d7db4 ("stmmac: pci: Add dwmac support for Loongson") Signed-off-by: Philipp Stanner Reviewed-by: Andrew Lunn Reviewed-by: Yanteng Si Tested-by: Henry Chen --- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c index bfe6e2d631bd..73a6715a93e6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -11,6 +11,8 @@ #include "dwmac_dma.h" #include "dwmac1000.h" +#define DRIVER_NAME "dwmac-loongson-pci" + /* Normal Loongson Tx Summary */ #define DMA_INTR_ENA_NIE_TX_LOONGSON 0x00040000 /* Normal Loongson Rx Summary */ @@ -555,7 +557,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id for (i = 0; i < PCI_STD_NUM_BARS; i++) { if (pci_resource_len(pdev, i) == 0) continue; - ret = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev)); + ret = pcim_iomap_regions(pdev, BIT(0), DRIVER_NAME); if (ret) goto err_disable_device; break; @@ -673,7 +675,7 @@ static const struct pci_device_id loongson_dwmac_id_table[] = { MODULE_DEVICE_TABLE(pci, loongson_dwmac_id_table); static struct pci_driver loongson_dwmac_driver = { - .name = "dwmac-loongson-pci", + .name = DRIVER_NAME, .id_table = loongson_dwmac_id_table, .probe = loongson_dwmac_probe, .remove = loongson_dwmac_remove,