From patchwork Thu Nov 14 11:25:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Lai X-Patchwork-Id: 13875033 X-Patchwork-Delegate: kuba@kernel.org Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A9D471F9424; Thu, 14 Nov 2024 11:26:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731583588; cv=none; b=LnMYimwYGpuPMooytkIpXmS+YHTtXRQmvTJ9ogjdNY5iJVL54VYhWIL2mY60a0pnTTScFp0qRFcFF6BuYAfvqP6sA2wgDlo9s6etzm8NwQvgJjijK4CeiMz0YVZ5ULfdMwOV5d7jSkyCIc26coW6UPXp9IJmbH5V61+jZeABz/I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731583588; c=relaxed/simple; bh=lsGpQKM8frLFe7nCknwME+o1eqdXv5hBX5iiVZiRjrg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jYMswi1llMiiZGYiC1UYTEHhfhI4z98GQrfghhSG7SKERGKhCzXvbls4S1AGI1XX9CdoaqZuVUYbfK6iPb8ZZrKGm6KHCllgtWC2ZZIK9kvyp0xfQ1InAEduAeYFPpXqn3pOg/sHNqm55SLSMTK0+UJLVECZgelQA8fCsCwcS3Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=CT/u12MC; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="CT/u12MC" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 4AEBQAxrC2914440, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1731583570; bh=lsGpQKM8frLFe7nCknwME+o1eqdXv5hBX5iiVZiRjrg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=CT/u12MCsrT2aDwlb9Axb8P39wQ2DG/xUVmEQ9ZG4StZ4ZCYOSk7u75zxUW1Sdjj5 eI854UE5nNprsbdQ46LXQ2dvq7WfJV9QeqeMpX6MaBN5pv/t7PVyXSRAoNFfx6wsjs 04JsZKtowISivqCjc2RFSavxAmTaVHnVTIKHXOa/x7PAkU3GSiyG+gWJShRGy2ULrX mjKIn5iAgPkMtr8qz3d4BSnZIy7o8/L+cpTjP57W1PK7VtTd3+KpLG2+VDI7a0ZSDz +dFjqAvhLv1LiOG6Jxu94y+yp52wRtXhB8I0tuRsGT5JfY/+2K6TxfCDIiyx6Yu3UY wzGLtfFd4htLw== Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 4AEBQAxrC2914440 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Nov 2024 19:26:10 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 14 Nov 2024 19:26:10 +0800 Received: from RTDOMAIN (172.21.210.74) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 14 Nov 2024 19:26:10 +0800 From: Justin Lai To: CC: , , , , , , , , , Justin Lai Subject: [PATCH net-next 1/2] rtase: Modify the name of the goto label Date: Thu, 14 Nov 2024 19:25:48 +0800 Message-ID: <20241114112549.376101-2-justinlai0215@realtek.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241114112549.376101-1-justinlai0215@realtek.com> References: <20241114112549.376101-1-justinlai0215@realtek.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXH36505.realtek.com.tw (172.21.6.25) To RTEXMBS04.realtek.com.tw (172.21.6.97) X-Patchwork-Delegate: kuba@kernel.org Modify the name of the goto label in rtase_init_one(). Signed-off-by: Justin Lai Reviewed-by: Simon Horman --- drivers/net/ethernet/realtek/rtase/rtase_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/realtek/rtase/rtase_main.c b/drivers/net/ethernet/realtek/rtase/rtase_main.c index f8777b7663d3..874994d9ceb9 100644 --- a/drivers/net/ethernet/realtek/rtase/rtase_main.c +++ b/drivers/net/ethernet/realtek/rtase/rtase_main.c @@ -2115,7 +2115,7 @@ static int rtase_init_one(struct pci_dev *pdev, ret = rtase_alloc_interrupt(pdev, tp); if (ret < 0) { dev_err(&pdev->dev, "unable to alloc MSIX/MSI\n"); - goto err_out_1; + goto err_out_del_napi; } rtase_init_netdev_ops(dev); @@ -2148,7 +2148,7 @@ static int rtase_init_one(struct pci_dev *pdev, GFP_KERNEL); if (!tp->tally_vaddr) { ret = -ENOMEM; - goto err_out; + goto err_out_free_dma; } rtase_tally_counter_clear(tp); @@ -2159,13 +2159,13 @@ static int rtase_init_one(struct pci_dev *pdev, ret = register_netdev(dev); if (ret != 0) - goto err_out; + goto err_out_free_dma; netdev_dbg(dev, "%pM, IRQ %d\n", dev->dev_addr, dev->irq); return 0; -err_out: +err_out_free_dma: if (tp->tally_vaddr) { dma_free_coherent(&pdev->dev, sizeof(*tp->tally_vaddr), @@ -2175,7 +2175,7 @@ static int rtase_init_one(struct pci_dev *pdev, tp->tally_vaddr = NULL; } -err_out_1: +err_out_del_napi: for (i = 0; i < tp->int_nums; i++) { ivec = &tp->int_vector[i]; netif_napi_del(&ivec->napi); From patchwork Thu Nov 14 11:25:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Lai X-Patchwork-Id: 13875034 X-Patchwork-Delegate: kuba@kernel.org Received: from rtits2.realtek.com.tw (rtits2.realtek.com [211.75.126.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F858192D9D; Thu, 14 Nov 2024 11:26:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.75.126.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731583601; cv=none; b=mtl+2DypR66edtjVqhba0mbCHrqriiydPcQXOa8NWf1KtzpdZT2EevHuxfG5FFApef0yys8ZAt4xxQjuV38gYqb/ofW1brddqyf6R7ZkHKVMXCgB5Lh9GmF7o1Qn6+85ucBRM7gqg0zLHH5B/ISi2nLgrybTWev32BNtoQHZ/bg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731583601; c=relaxed/simple; bh=kKjgiDjn34LW7LUqNfMkPGcZHB4LMhAYI0N5yrhZZEk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gGb+JrXuedcW8RcvEkahDkWxIT5ofas74qT+a/xOzI+B/ovSGKkW8lhSIo2KuYYAjfOCRAGl1rfCzqvf/bZspmNaOvr5D6Xww0/fmlGQbFvx/U5foMNlLo+IIsM8Tsz8dj6Z0AYrM47UhCJ9O3ub9UAe0KbznlQb5NFkXAErggY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com; spf=pass smtp.mailfrom=realtek.com; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b=qv9MWOgI; arc=none smtp.client-ip=211.75.126.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=realtek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=realtek.com Authentication-Results: smtp.subspace.kernel.org; dkim=temperror (0-bit key) header.d=realtek.com header.i=@realtek.com header.b="qv9MWOgI" X-SpamFilter-By: ArmorX SpamTrap 5.78 with qID 4AEBQPJf82914541, This message is accepted by code: ctloc85258 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=realtek.com; s=dkim; t=1731583585; bh=kKjgiDjn34LW7LUqNfMkPGcZHB4LMhAYI0N5yrhZZEk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Content-Type; b=qv9MWOgItQOJTXeQNARreVCz6worTxDRNKpv5aHiD1Pd0D2ljgN+GPng/l8Y4ouxE Do2ix7DKL7fCYmMuU5/qL3GKGyeUJM6xl6mz2Z87q4MX9Tlk4wz+TmS6189g812FE/ r4lAff4MzBCu74c9m3Q+eaC2vXTAUsVFa5L83sBN1n9g5e+/KA4NtjCPuNuRZYp9F+ o/KYumnpBEo2tZbNO7XdaGk0+1/CjkF+nddSH/6wBjxHnrG9gyVs1PgUF1iIucvq/W IjAVdykv8lsOQxg8FuQ9idfXkuZ+NIIbG64DnEF6mtlIv1qDaIJRjaoyQwLjHRRoyn Cjr+djWHLm2Yw== Received: from mail.realtek.com (rtexh36506.realtek.com.tw[172.21.6.27]) by rtits2.realtek.com.tw (8.15.2/3.06/5.92) with ESMTPS id 4AEBQPJf82914541 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Nov 2024 19:26:25 +0800 Received: from RTEXMBS04.realtek.com.tw (172.21.6.97) by RTEXH36506.realtek.com.tw (172.21.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 14 Nov 2024 19:26:25 +0800 Received: from RTDOMAIN (172.21.210.74) by RTEXMBS04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 14 Nov 2024 19:26:25 +0800 From: Justin Lai To: CC: , , , , , , , , , Justin Lai Subject: [PATCH net-next 2/2] rtase: Modify the content format of the enum rtase_registers Date: Thu, 14 Nov 2024 19:25:49 +0800 Message-ID: <20241114112549.376101-3-justinlai0215@realtek.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241114112549.376101-1-justinlai0215@realtek.com> References: <20241114112549.376101-1-justinlai0215@realtek.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: RTEXH36506.realtek.com.tw (172.21.6.27) To RTEXMBS04.realtek.com.tw (172.21.6.97) X-Patchwork-Delegate: kuba@kernel.org Remove unnecessary spaces. Signed-off-by: Justin Lai Reviewed-by: Simon Horman --- drivers/net/ethernet/realtek/rtase/rtase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/rtase/rtase.h b/drivers/net/ethernet/realtek/rtase/rtase.h index 583c33930f88..942f1e531a85 100644 --- a/drivers/net/ethernet/realtek/rtase/rtase.h +++ b/drivers/net/ethernet/realtek/rtase/rtase.h @@ -170,7 +170,7 @@ enum rtase_registers { RTASE_INT_MITI_TX = 0x0A00, RTASE_INT_MITI_RX = 0x0A80, - RTASE_VLAN_ENTRY_0 = 0xAC80, + RTASE_VLAN_ENTRY_0 = 0xAC80, }; enum rtase_desc_status_bit {