Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp159516rdb; Thu, 21 Dec 2023 05:52:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IG81shH7VnccjGBn2ho/oxIXlcBAx1FFQDipAvCYFESNQQMJtrEMuJp1dMtFKYH2tDRbszC X-Received: by 2002:a05:6214:d66:b0:67f:1b0e:2a7e with SMTP id 6-20020a0562140d6600b0067f1b0e2a7emr16298759qvs.12.1703166776840; Thu, 21 Dec 2023 05:52:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703166776; cv=none; d=google.com; s=arc-20160816; b=fz4ZnIUVkmyo9sJJa9i3sCBYkaZHWs3OzUTlnIV4QZNs6ZYgV4a3Y6zw98mFrag22b gueeeeAjHpj1f4bDV2pLGF5+lQC6/XWgQ4C0gp54prsKfVLo/QQD6HJaRczR5BW8d5Hu sKCPGJn9gDN5ynn6vhov7cZrKc44mGouKsMFUi7y+w6TwPqWTLekAVvSohS3E1yrtrEk uyb0RsARtldZL0SK/hniqQtRMDCVIxYgUnrSuQWRUriKx3PYBI0jhMvhnLT2VC41EqCp ndlVJ6uQnxaSz1XZg+5xAncwBPxK8KzEcQ9QwX+0p3STyX3UGXiC4Z2guE/GRIoSGT5L PlQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=SCByZ9VVaub2suP3DqMc366KtGgAL5TTHg0lzIk5K6A=; fh=eCURnhYsmAKCmpr5rzlz6mC8wwxsX3cJ1Vn/LebV9UM=; b=iGuwsSiENOW1QOtW6bysGnxL4DREA59MwjwFKsKP8lHU2K0oIjlknJk5kmOGXQg0wY jtTXVssDLZbcGy85zqCAQ7BfVUFNGyryx/tiQseIUzVnGCc3xQ3Nx4oBowBXqYhgRsyJ 2/DDyEqhak4iYz453JkVzgw12zKGVi4TauWNeAefqS4dAUX4pquLmsiRwIqkicYn4Y+f VPS0CObW7PSZ5BvBIkeaS4fZXG9CIQGzv6JnzNxtHPNfwJkWCRBQrFTRhieuSRRvwwrH b+C7VH1Cpok5OiJSyaxjvhw1LOibRFo3ED68eI3LZGpnlNpL3m5UdymnM2rAuX2Q+tW2 7rrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cv+BHf8q; spf=pass (google.com: domain of linux-kernel+bounces-8505-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8505-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id t20-20020a0ce2d4000000b0067f8dc03511si243937qvl.80.2023.12.21.05.52.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 05:52:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-8505-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cv+BHf8q; spf=pass (google.com: domain of linux-kernel+bounces-8505-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-8505-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 898581C25091 for ; Thu, 21 Dec 2023 13:52:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C609E7C672; Thu, 21 Dec 2023 13:40:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="cv+BHf8q" X-Original-To: linux-kernel@vger.kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 72BD17C653; Thu, 21 Dec 2023 13:40:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703166055; x=1734702055; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Tov8wWJ5efMQB+MBw6ZRhy90dLcQ3ea0IO1FuVFBmws=; b=cv+BHf8q+U3I/8gphyqmJvKYC8dWSobres4n2zI1Wdx0HAdFrg5rNPVR OwUDopqpxYib053dIBEL0cct33VUbUDn+UvTP0GOhDOZ+LTKHIaaCfz3Z 00FYi0EblZl6ZGgK7yBG8/UuXdyLBO8eZXLgLBBOjIvlgiVF9omEScfUs ERWca5DQ66g8Clto4+aMlxtvBnvd7DAR//Qlv5oiaTvdD9WSbSxmBE3lo lKC+t3BZOjA7myg8LExQUCu0F38WTjGIVLjp5g2SiijKUut/q/AmyCjrN SPhSlnqvRKSEoTOmMR4a2fSMZYrNkVriPjjb+exvxrr37GSyLO2XwcYss Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10930"; a="9446065" X-IronPort-AV: E=Sophos;i="6.04,293,1695711600"; d="scan'208";a="9446065" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2023 05:40:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10930"; a="1108105173" X-IronPort-AV: E=Sophos;i="6.04,293,1695711600"; d="scan'208";a="1108105173" Received: from pglc00021.png.intel.com ([10.221.207.41]) by fmsmga005.fm.intel.com with ESMTP; 21 Dec 2023 05:40:51 -0800 From: To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: jdavem@davemloft.net, edumazet@google.com, pabeni@redhat.com, mun.yew.tham@intel.com, Nagaraju DeepakX , Andy Schevchenko Subject: [PATCH v2 2/4] net: ethernet: altera: fix indentation warnings Date: Thu, 21 Dec 2023 21:40:39 +0800 Message-Id: <20231221134041.27104-3-deepakx.nagaraju@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20231221134041.27104-1-deepakx.nagaraju@intel.com> References: <20231213071112.18242-6-deepakx.nagaraju@intel.com> <20231221134041.27104-1-deepakx.nagaraju@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Nagaraju DeepakX Fix indentation issues such as missing a blank line after declarations and alignment issues. Signed-off-by: Nagaraju DeepakX Reviewed-by: Andy Schevchenko --- drivers/net/ethernet/altera/altera_sgdma.c | 22 +++++++++---------- drivers/net/ethernet/altera/altera_tse_main.c | 9 +++----- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/altera/altera_sgdma.c b/drivers/net/ethernet/altera/altera_sgdma.c index 5517f89f1ef9..d4edfb3e09e8 100644 --- a/drivers/net/ethernet/altera/altera_sgdma.c +++ b/drivers/net/ethernet/altera/altera_sgdma.c @@ -20,7 +20,7 @@ static void sgdma_setup_descrip(struct sgdma_descrip __iomem *desc, int wfixed); static int sgdma_async_write(struct altera_tse_private *priv, - struct sgdma_descrip __iomem *desc); + struct sgdma_descrip __iomem *desc); static int sgdma_async_read(struct altera_tse_private *priv); @@ -63,7 +63,6 @@ int sgdma_initialize(struct altera_tse_private *priv) INIT_LIST_HEAD(&priv->txlisthd); INIT_LIST_HEAD(&priv->rxlisthd); - priv->rxdescphys = dma_map_single(priv->device, (void __force *)priv->rx_dma_desc, priv->rxdescmem, DMA_BIDIRECTIONAL); @@ -192,9 +191,7 @@ int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer) return 1; } - -/* tx_lock held to protect access to queued tx list - */ +/* tx_lock held to protect access to queued tx list */ u32 sgdma_tx_completions(struct altera_tse_private *priv) { u32 ready = 0; @@ -237,10 +234,9 @@ u32 sgdma_rx_status(struct altera_tse_private *priv) if (sts & SGDMA_STSREG_EOP) { unsigned int pktlength; unsigned int pktstatus; - dma_sync_single_for_cpu(priv->device, - priv->rxdescphys, - SGDMA_DESC_LEN, - DMA_FROM_DEVICE); + + dma_sync_single_for_cpu(priv->device, priv->rxdescphys, + SGDMA_DESC_LEN, DMA_FROM_DEVICE); pktlength = csrrd16(desc, sgdma_descroffs(bytes_xferred)); pktstatus = csrrd8(desc, sgdma_descroffs(status)); @@ -286,7 +282,6 @@ u32 sgdma_rx_status(struct altera_tse_private *priv) return rxstatus; } - /* Private functions */ static void sgdma_setup_descrip(struct sgdma_descrip __iomem *desc, struct sgdma_descrip __iomem *ndesc, @@ -301,6 +296,7 @@ static void sgdma_setup_descrip(struct sgdma_descrip __iomem *desc, /* Clear the next descriptor as not owned by hardware */ u32 ctrl = csrrd8(ndesc, sgdma_descroffs(control)); + ctrl &= ~SGDMA_CONTROL_HW_OWNED; csrwr8(ctrl, ndesc, sgdma_descroffs(control)); @@ -406,6 +402,7 @@ sgdma_txphysaddr(struct altera_tse_private *priv, { dma_addr_t paddr = priv->txdescmem_busaddr; uintptr_t offs = (uintptr_t)desc - (uintptr_t)priv->tx_dma_desc; + return (dma_addr_t)((uintptr_t)paddr + offs); } @@ -415,6 +412,7 @@ sgdma_rxphysaddr(struct altera_tse_private *priv, { dma_addr_t paddr = priv->rxdescmem_busaddr; uintptr_t offs = (uintptr_t)desc - (uintptr_t)priv->rx_dma_desc; + return (dma_addr_t)((uintptr_t)paddr + offs); } @@ -445,7 +443,6 @@ queue_tx(struct altera_tse_private *priv, struct tse_buffer *buffer) list_add_tail(&buffer->lh, &priv->txlisthd); } - /* adds a tse_buffer to the tail of a rx buffer list * assumes the caller is managing and holding a mutual exclusion * primitive to avoid simultaneous pushes/pops to the list. @@ -465,6 +462,7 @@ static struct tse_buffer * dequeue_tx(struct altera_tse_private *priv) { struct tse_buffer *buffer = NULL; + list_remove_head(&priv->txlisthd, buffer, struct tse_buffer, lh); return buffer; } @@ -478,6 +476,7 @@ static struct tse_buffer * dequeue_rx(struct altera_tse_private *priv) { struct tse_buffer *buffer = NULL; + list_remove_head(&priv->rxlisthd, buffer, struct tse_buffer, lh); return buffer; } @@ -492,6 +491,7 @@ static struct tse_buffer * queue_rx_peekhead(struct altera_tse_private *priv) { struct tse_buffer *buffer = NULL; + list_peek_head(&priv->rxlisthd, buffer, struct tse_buffer, lh); return buffer; } diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c index 1c8763be0e4b..6a1a004ea693 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c @@ -258,14 +258,12 @@ static int alloc_init_skbufs(struct altera_tse_private *priv) int i; /* Create Rx ring buffer */ - priv->rx_ring = kcalloc(rx_descs, sizeof(struct tse_buffer), - GFP_KERNEL); + priv->rx_ring = kcalloc(rx_descs, sizeof(struct tse_buffer), GFP_KERNEL); if (!priv->rx_ring) goto err_rx_ring; /* Create Tx ring buffer */ - priv->tx_ring = kcalloc(tx_descs, sizeof(struct tse_buffer), - GFP_KERNEL); + priv->tx_ring = kcalloc(tx_descs, sizeof(struct tse_buffer), GFP_KERNEL); if (!priv->tx_ring) goto err_tx_ring; @@ -319,8 +317,7 @@ static inline void tse_rx_refill(struct altera_tse_private *priv) unsigned int entry; int ret; - for (; priv->rx_cons - priv->rx_prod > 0; - priv->rx_prod++) { + for (; priv->rx_cons - priv->rx_prod > 0; priv->rx_prod++) { entry = priv->rx_prod % rxsize; if (likely(priv->rx_ring[entry].skb == NULL)) { ret = tse_init_rx_buffer(priv, &priv->rx_ring[entry], -- 2.26.2