From nobody Wed Dec 17 03:00:15 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E83ACC0032E for ; Sat, 21 Oct 2023 10:15:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231358AbjJUKPj (ORCPT ); Sat, 21 Oct 2023 06:15:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231250AbjJUKP1 (ORCPT ); Sat, 21 Oct 2023 06:15:27 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DAB110D5 for ; Sat, 21 Oct 2023 03:15:15 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-5079eed8bfbso2317375e87.1 for ; Sat, 21 Oct 2023 03:15:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697883314; x=1698488114; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OzDHqn7UNaJzOjgCcjrENJmpRSweOhwpG6H5CfyFDbc=; b=DgcHoxtWbIxRFvKJyMy8A4MyHnWN/rab08Eyo/x/7dsKpn7gNcmR5cwdXshkg5Nes9 q7weat9GaRFX76Mptfi1VgUc8Fox/EEhzBwHB8k7FO9S2JsEHVO+Qx8PNT2Getevs6mf QUsijHc32hB8FLaBVU4Iwd9ASXtEKlHLXqP39VRDNgNRFj1XpDt3udOXJDidRD9i4BeW Yjs5gctd9rC5hw2BYNzIKEeKlEORteSJs7TWkAA7wvybhMoYU48AGMteL7di0fXAEZhh 4qPKuMfnw92JUJ3iIVKa4APKl/s6FDVeaTt9w6PHDqK0zOjhCDBj7xsAm+Zc6SBI5BWQ HAPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697883314; x=1698488114; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OzDHqn7UNaJzOjgCcjrENJmpRSweOhwpG6H5CfyFDbc=; b=sCm73HhJXTHBDOW1Rx+SlQjpbPrccDCDznLUiRvBE+fuV5t/cLLxkzvIdc4VIuB7H5 J1XaY5iogxXpNd/rNDLaQO419bIrQ/3iHy9nM7aWXI75nzrv83flUyXDdgO4JUz6YFjd 3qoqACOG0Jv/jO3s3mL2qZTSub/7sbMGFVIBhh8MFV683QhfD8bNELM0Fi5arefC/XRX ruf/unS9QtwvF7z6HUBFktHQSphLNVVBRaf8BVH1+ZQZd6cpC0SLtU5aVq6SOvZ3Sbqg 5IEx8DxCozhZsdqelhdonlhdf72eKNlgBmArKbjIH+h4ayYuNBK/Lc95TOXeu+tW/ScY hMgQ== X-Gm-Message-State: AOJu0YzQz0KMHJIsN4mJdeo7yxonYdiufMzIjNV70Z9HOyAeMrvyJWHW MczNqPtXJ6bG7S5VCHvkigw= X-Google-Smtp-Source: AGHT+IHDPVY4sNcclDFYWhFX/VrTw2vslXmMeCj+Hasg4Lr25V58WfbCv/H1hTrGtHIo3nN9NFVlIg== X-Received: by 2002:a05:6512:baa:b0:500:acf1:b432 with SMTP id b42-20020a0565120baa00b00500acf1b432mr3336978lfv.63.1697883313787; Sat, 21 Oct 2023 03:15:13 -0700 (PDT) Received: from HP-ENVY-Notebook.lan (81-229-94-10-no68.tbcn.telia.com. [81.229.94.10]) by smtp.googlemail.com with ESMTPSA id d18-20020a056512369200b005007e7211f7sm803114lfs.21.2023.10.21.03.15.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:15:13 -0700 (PDT) From: Jonathan Bergh To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Jonathan Bergh Subject: [PATCH v3 7/7] staging: octeon: Fix introduction of new typedef cvmx_pko_port_status_t in octeon driver Date: Sat, 21 Oct 2023 12:12:38 +0200 Message-Id: <20231021101238.81466-8-bergh.jonathan@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231021101238.81466-1-bergh.jonathan@gmail.com> References: <20231021101238.81466-1-bergh.jonathan@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch removes the introduction of a new struct typedef cvmx_pko_port_status_t in the octeon driver and then fixes the implementations which used it. Signed-off-by: Jonathan Bergh --- Changelog: =20 v1 -> v2: Fix breaking change spread across multiple patches =20 v2 -> v3: Break changes up into individual patches for each removed =20 typedef drivers/staging/octeon/ethernet.c | 2 +- drivers/staging/octeon/octeon-stubs.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/eth= ernet.c index 8c48acab49e4..8e1f4b987a25 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -202,7 +202,7 @@ EXPORT_SYMBOL(cvm_oct_free_work); static struct net_device_stats *cvm_oct_common_get_stats(struct net_device= *dev) { struct cvmx_pip_port_status rx_status; - cvmx_pko_port_status_t tx_status; + struct cvmx_pko_port_status tx_status; struct octeon_ethernet *priv =3D netdev_priv(dev); =20 if (priv->port < CVMX_PIP_NUM_INPUT_PORTS) { diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon= /octeon-stubs.h index 33a0e1d5f961..cf7f77061eb9 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -409,11 +409,11 @@ struct cvmx_pip_port_status { uint16_t inb_errors; }; =20 -typedef struct { +struct cvmx_pko_port_status { uint32_t packets; uint64_t octets; uint64_t doorbell; -} cvmx_pko_port_status_t; +}; =20 union cvmx_pip_frm_len_chkx { uint64_t u64; @@ -1262,7 +1262,7 @@ static inline void cvmx_pip_get_port_status(uint64_t = port_num, uint64_t clear, { } =20 static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t cl= ear, - cvmx_pko_port_status_t *status) + struct cvmx_pko_port_status *status) { } =20 static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mo= de(int --=20 2.40.1