From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2524DA59 for ; Fri, 13 Sep 2024 01:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726190638; cv=none; b=Ic7ajsMNTy0L5QCvtHnqJx6wWzJam544/ESAAbPsHbHpgdT7l88CwS5ea9iBBphhfDiNOVPl5+oF2VGhNUhTtE2nHw0MR4RgnJ1VDFospzx5O52emnlwLb0ooPRQmECcx4gmwETsoEHjfxrrw67THLojgZZbJNVEMw5fe9/WVas= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726190638; c=relaxed/simple; bh=2skpZ+igqMa05EpjsU2imKS/e7f/yudaLQvKpLKXbwg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gvF9yQL+RJUJyYEoL0/eAdb8LKnFUUmqUl3d+t97gXyLjmMMAbk2xcDTgcbu/lUdSQIo6QGz3C0xBLTupiKBxgwECzH4t9YyDqTlDkLyMf7/Zhnz65kgHE13PGaEw35amSJ/6MGZJssnpYowVKtIZzwZbgYRaPrrwqE+UoNUpQA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=b1n.io; spf=pass smtp.mailfrom=b1n.io; dkim=pass (2048-bit key) header.d=b1n.io header.i=@b1n.io header.b=OJKzIGNs; arc=none smtp.client-ip=91.218.175.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=b1n.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=b1n.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=b1n.io header.i=@b1n.io header.b="OJKzIGNs" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=b1n.io; s=key1; t=1726190634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QXCwJ5OeNwAoorOSYWPVs7vJlg7KJMPVr8euqCMvf0M=; b=OJKzIGNsxPlYYOwPBTInkDsRtcPoL7N75T8Cqi/UqWyVxfgRkkAmJtxuiOUvSFGXYM/lvC Xyc8NRWz+1/3TZvqyW8cHznY1vOQS68ANrydkbd7qiNwX0Cwt+SniJNVqogCZ2IIVyj+B5 Evqynmee8WXsHVirtcuPL7UZ1rU/hEg5qMo0bAjgfiLsW43HmB0pKJeFUKJOsAzTyy3Vgg axHYaqoIiBqmJBVHZAFc6Nvi1piTm2qGuf4YqaMQKox9havDua5GeamTu/bogYqgIUsQM0 4Y/Vd8OzU7A8J3h8tM2UxJUXBw4fH42HE8Xm0mfL0xHAg3H2VHjvOKM1MvkSnA== From: Xingquan Liu To: Philipp Hortmann , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Xingquan Liu Subject: [PATCH v3 2/2] staging: vt6655: Rename variable apTD1Rings Date: Fri, 13 Sep 2024 09:23:42 +0800 Message-Id: <20240913012343.42579-2-b1n@b1n.io> In-Reply-To: <20240913012343.42579-1-b1n@b1n.io> References: <20240913012343.42579-1-b1n@b1n.io> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Rename variable apTD1Rings to ap_td1_rings to fix checkpatch warning Avoid CamelCase. Signed-off-by: Xingquan Liu --- v3: Add change history v2: Rename variable apTD1Rings drivers/staging/vt6655/card.c | 6 +++--- drivers/staging/vt6655/device.h | 2 +- drivers/staging/vt6655/device_main.c | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 36bf8cde2e08..6a2e390e9493 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -391,8 +391,8 @@ void card_safe_reset_tx(struct vnt_private *priv) priv->tail_td[0] = &priv->ap_td0_rings[0]; priv->apCurrTD[0] = &priv->ap_td0_rings[0]; - priv->tail_td[1] = &priv->apTD1Rings[0]; - priv->apCurrTD[1] = &priv->apTD1Rings[0]; + priv->tail_td[1] = &priv->ap_td1_rings[0]; + priv->apCurrTD[1] = &priv->ap_td1_rings[0]; for (uu = 0; uu < TYPE_MAXTD; uu++) priv->iTDUsed[uu] = 0; @@ -403,7 +403,7 @@ void card_safe_reset_tx(struct vnt_private *priv) /* init all Tx Packet pointer to NULL */ } for (uu = 0; uu < priv->opts.tx_descs[1]; uu++) { - curr_td = &priv->apTD1Rings[uu]; + curr_td = &priv->ap_td1_rings[uu]; curr_td->td0.owner = OWNED_BY_HOST; /* init all Tx Packet pointer to NULL */ } diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 32c51d794264..5eaab6b172d3 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -136,7 +136,7 @@ struct vnt_private { struct vnt_tx_desc *tail_td[TYPE_MAXTD]; struct vnt_tx_desc *ap_td0_rings; - struct vnt_tx_desc *apTD1Rings; + struct vnt_tx_desc *ap_td1_rings; struct vnt_rx_desc *aRD0Ring; struct vnt_rx_desc *aRD1Ring; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index a8dcd8ad3945..bf3ecf720206 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -554,7 +554,7 @@ static bool device_init_rings(struct vnt_private *priv) + priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc) + priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc); - priv->apTD1Rings = vir_pool + priv->ap_td1_rings = vir_pool + priv->opts.rx_descs0 * sizeof(struct vnt_rx_desc) + priv->opts.rx_descs1 * sizeof(struct vnt_rx_desc) + priv->opts.tx_descs[0] * sizeof(struct vnt_tx_desc); @@ -761,7 +761,7 @@ static int device_init_td1_ring(struct vnt_private *priv) curr = priv->td1_pool_dma; for (i = 0; i < priv->opts.tx_descs[1]; i++, curr += sizeof(struct vnt_tx_desc)) { - desc = &priv->apTD1Rings[i]; + desc = &priv->ap_td1_rings[i]; desc->td_info = kzalloc(sizeof(*desc->td_info), GFP_KERNEL); if (!desc->td_info) { ret = -ENOMEM; @@ -771,19 +771,19 @@ static int device_init_td1_ring(struct vnt_private *priv) desc->td_info->buf = priv->tx1_bufs + i * PKT_BUF_SZ; desc->td_info->buf_dma = priv->tx_bufs_dma1 + i * PKT_BUF_SZ; - desc->next = &(priv->apTD1Rings[(i + 1) % priv->opts.tx_descs[1]]); + desc->next = &(priv->ap_td1_rings[(i + 1) % priv->opts.tx_descs[1]]); desc->next_desc = cpu_to_le32(curr + sizeof(struct vnt_tx_desc)); } if (i > 0) - priv->apTD1Rings[i - 1].next_desc = cpu_to_le32(priv->td1_pool_dma); - priv->tail_td[1] = priv->apCurrTD[1] = &priv->apTD1Rings[0]; + priv->ap_td1_rings[i - 1].next_desc = cpu_to_le32(priv->td1_pool_dma); + priv->tail_td[1] = priv->apCurrTD[1] = &priv->ap_td1_rings[0]; return 0; err_free_desc: while (i--) { - desc = &priv->apTD1Rings[i]; + desc = &priv->ap_td1_rings[i]; kfree(desc->td_info); } @@ -808,7 +808,7 @@ static void device_free_td1_ring(struct vnt_private *priv) int i; for (i = 0; i < priv->opts.tx_descs[1]; i++) { - struct vnt_tx_desc *desc = &priv->apTD1Rings[i]; + struct vnt_tx_desc *desc = &priv->ap_td1_rings[i]; struct vnt_td_info *td_info = desc->td_info; dev_kfree_skb(td_info->skb); -- Xingquan Liu