From nobody Tue Dec 16 19:55:00 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 99F04C0032E for ; Sat, 21 Oct 2023 10:15:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230324AbjJUKPB (ORCPT ); Sat, 21 Oct 2023 06:15:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229472AbjJUKO7 (ORCPT ); Sat, 21 Oct 2023 06:14:59 -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 AF448D66 for ; Sat, 21 Oct 2023 03:14:57 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-507a55302e0so2100713e87.0 for ; Sat, 21 Oct 2023 03:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697883296; x=1698488096; 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=54U+E9W9K0OaBdlR5lzHV/a+8QqdJ6fYDyraEx8zyqE=; b=C4MXKvDbFm0xM+3ILpOBEkPhyN0GpARXVviEVEDtD4DtCtFAYb2YaKx6zWzvaey00b 2FqjTvvYLzHM2QJi4icy7ileIIls7MyhPI11tTJ9gLFY9IDTeFnOaUQ8eGZ4F1JXe4lS ydKdwtCucwE9ypAyy4Un2I5WnJrIHAed4eFkYGmvTVVfwzIdGjcMPNi8Q2+QSwgJwQVh 1ylGt4yYZeXBkk1H3f56ihIhaETFLA8eZT8IUIDiY3YFPB9w1VBwGkPBgzII5EST391O GlvAwsyKXEM/L4upapyJGg4VVoiHY1eCHvjZWGOvhgYqdbdJEeY2txZThjXvlinhOc/w Lmjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697883296; x=1698488096; 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=54U+E9W9K0OaBdlR5lzHV/a+8QqdJ6fYDyraEx8zyqE=; b=kMrREUzpOr8UyAxpGkKfYZrKMkub6k1oH2COQnTyPDb7sMu4maRUvjjTn3N3nPZcbW zjaLcZD0bTsW5NQ+FffU3TkZEf4MtvmNBU04Zp1hTNobFQufetNCTVG1GN5H1v1lc66n JY60Wtw8e5SNXprUCz9GLOL8jqUysYdNiwkCbE5aCqshB4GUgbvalNHhckrsnH7PABn6 ppX2Xp5bTS8VAwoKXlnkaHosvc+uVv1TqsbVpFETDEGQTGMR3CCJodoIlm841PTo49w2 /XJt5fYxe1RrOfyMxVUUUA8poWw6AdI1rX5GG0IU/SXzmKtsKR8ZAGnw+Po4VfcrgWkR 3djA== X-Gm-Message-State: AOJu0YysjHDTr6BV+MCUX2kW4aZ17yHEXTTJ3aQ2Z+IkjG1aTEH6YRS4 SLkfAxn3LMV3w6k/yHn10w0= X-Google-Smtp-Source: AGHT+IF4HwHDY5OOqVDBCMW9b6O+w115b7KFZw6tu7WvakGEpq7rLPnhLcH6W5i3GsnyiXl6mUhQ/w== X-Received: by 2002:ac2:4284:0:b0:506:899d:1989 with SMTP id m4-20020ac24284000000b00506899d1989mr3113028lfh.44.1697883295672; Sat, 21 Oct 2023 03:14:55 -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.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:14:55 -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 1/7] staging: octeon: Fix introduction of new enum typedef cvmx_spi_mode_t in octeon Date: Sat, 21 Oct 2023 12:12:32 +0200 Message-Id: <20231021101238.81466-2-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 the following new enum typedef cvmx_spi_mode_t and fixes up where implementations which used it. Signed-off-by: Jonathan Bergh --- Changelog: 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/octeon-stubs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon= /octeon-stubs.h index 3e7b92cd2e35..9f269626b862 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -213,12 +213,12 @@ enum cvmx_fau_op_size { CVMX_FAU_OP_SIZE_64 =3D 3 }; =20 -typedef enum { +enum cvmx_spi_mode { CVMX_SPI_MODE_UNKNOWN =3D 0, CVMX_SPI_MODE_TX_HALFPLEX =3D 1, CVMX_SPI_MODE_RX_HALFPLEX =3D 2, CVMX_SPI_MODE_DUPLEX =3D 3 -} cvmx_spi_mode_t; +}; =20 typedef enum { CVMX_HELPER_INTERFACE_MODE_DISABLED, @@ -1362,7 +1362,7 @@ static inline struct cvmx_wqe *cvmx_pow_work_request_= sync(cvmx_pow_wait_t wait) } =20 static inline int cvmx_spi_restart_interface(int interface, - cvmx_spi_mode_t mode, int timeout) + enum cvmx_spi_mode mode, int timeout) { return 0; } --=20 2.40.1 From nobody Tue Dec 16 19:55:00 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 ACD89C0032E for ; Sat, 21 Oct 2023 10:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230517AbjJUKPI (ORCPT ); Sat, 21 Oct 2023 06:15:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230505AbjJUKPF (ORCPT ); Sat, 21 Oct 2023 06:15:05 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B350D52 for ; Sat, 21 Oct 2023 03:15:00 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-507adc3381cso2368792e87.3 for ; Sat, 21 Oct 2023 03:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697883299; x=1698488099; 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=mA8KD11qpf6KZqgPVgnRyUQoU2OH4Y/VAnk/+JUKr/8=; b=HsYRIDweD6s9SqBTTvK5txr1pVJWUW1poRUonKHAb7xOM/H9LbwqMkB1ZguqYZgcbV Ml01dsiROGxr4Ntn2K+H3rkYJSIgtPtT0btPaWSoNFEpCrhe2nSLnHruHSUQLASMQFj9 drydtZ+ekz0pM/0qR9gEgkXEOAg4mpp6bJkAem8ibPEWIIONCtqczxsILTVlAf+eos8v TiFfwcNT50tgfIJTN2xsOQk+8R8Z0XY8vux5W5b+HTFZKBniZYM+LgUMiY875Aw6iOe2 77nmQvQIKw1z6S1irRa9n6Ub4Nij3tzYHrDHpFLzmfeM5dhQz6IWb+ptnQ7f53CXhEh4 h4Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697883299; x=1698488099; 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=mA8KD11qpf6KZqgPVgnRyUQoU2OH4Y/VAnk/+JUKr/8=; b=LPY7CygUo22QaZh72w4BNktgU1Cs8X0sPFnqpCCGAefwJ/8l+cOnYZ0Fax1Pc6Kp4e N7Iojie8Uhj2kZuFLbm+YZhZc6UCuf0bHetZ2AU+IkwSSgzIyM5XEe6W1EX05Kl5HvhL YnDC2+HWFTQdChzOzrl4ZFamKVOmLpZs+6Gf+mlh3ZF62rxVT17MMlJYqmIG54hZCRjg 2xACcgFgqeTcWHsbp7GzgQ5vDq1UDsEl3xmvb/znu1EQoqCL+D6EGCmDBTWvUNQV9Dxy LerN2DPtAQAHVPgCJ+aUh+s+mRslDNbDUazvBgJ8T8IQ1sUBmYTlHcIFI8qs9X6/GwZb DcuQ== X-Gm-Message-State: AOJu0Yz+0oWXdc5EWOTFoIkRXcwtZx7nixHD4fL+lHQIWmSvoJEjL9jq 5aTHouD0dXN9m/sIoX+N0Uc= X-Google-Smtp-Source: AGHT+IFM9q6B8BGG10D4rtMe62hsk9wFcq8PPcVo8+WwGVZgFK5S/Oh8j2EyEzMsFep/6Xk+a7Kqnw== X-Received: by 2002:a19:645c:0:b0:505:6c99:bd7c with SMTP id b28-20020a19645c000000b005056c99bd7cmr2539883lfj.57.1697883298782; Sat, 21 Oct 2023 03:14:58 -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.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:14:57 -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 2/7] staging: octeon: Fix up introduction of new typedef cvmx_helper_interface_mode_t in octeon Date: Sat, 21 Oct 2023 12:12:33 +0200 Message-Id: <20231021101238.81466-3-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 typedef for the following enum cvmx_helper_interface_mode_t and then fixes up implementations that 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 9eee28f2940c..023b107e077a 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -798,7 +798,7 @@ static int cvm_oct_probe(struct platform_device *pdev) =20 num_interfaces =3D cvmx_helper_get_number_of_interfaces(); for (interface =3D 0; interface < num_interfaces; interface++) { - cvmx_helper_interface_mode_t imode =3D + enum cvmx_helper_interface_mode imode =3D cvmx_helper_interface_get_mode(interface); int num_ports =3D cvmx_helper_ports_on_interface(interface); int port; diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon= /octeon-stubs.h index 9f269626b862..40c357c77679 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -220,7 +220,7 @@ enum cvmx_spi_mode { CVMX_SPI_MODE_DUPLEX =3D 3 }; =20 -typedef enum { +enum cvmx_helper_interface_mode { CVMX_HELPER_INTERFACE_MODE_DISABLED, CVMX_HELPER_INTERFACE_MODE_RGMII, CVMX_HELPER_INTERFACE_MODE_GMII, @@ -231,7 +231,7 @@ typedef enum { CVMX_HELPER_INTERFACE_MODE_PICMG, CVMX_HELPER_INTERFACE_MODE_NPI, CVMX_HELPER_INTERFACE_MODE_LOOP, -} cvmx_helper_interface_mode_t; +}; =20 typedef enum { CVMX_POW_WAIT =3D 1, @@ -1265,7 +1265,7 @@ static inline void cvmx_pko_get_port_status(uint64_t = port_num, uint64_t clear, cvmx_pko_port_status_t *status) { } =20 -static inline cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(= int +static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mo= de(int interface) { return 0; --=20 2.40.1 From nobody Tue Dec 16 19:55:00 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 BF809C001E0 for ; Sat, 21 Oct 2023 10:15:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231181AbjJUKPL (ORCPT ); Sat, 21 Oct 2023 06:15:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230435AbjJUKPG (ORCPT ); Sat, 21 Oct 2023 06:15:06 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2FB410C4 for ; Sat, 21 Oct 2023 03:15:03 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-5079f9ec8d9so1920405e87.0 for ; Sat, 21 Oct 2023 03:15:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697883301; x=1698488101; 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=zu42pQJStzejxYxI5j1H3uBlC7qEy33j9WdXMX2X/AQ=; b=PrA+QRxjNTg8DzUeCgoSa7YK1t3wRY3A54tEd/UlegMXr9pAyvZ2/TMac6SJVGDecn Qmn9OjBEUSE7bDF9DsFFXfjXmIdc+KRhV+gSxH46ImPyObL02F6r7eQdI0plxyePl4x3 B1bLHKrmvcQ+Mi6FhOdM0OwDT9piU7vALt/Gn6wdO+cvSPPhU6Fyx5Od0j20xlJC/Gw4 XIGMqqKUEDcauSI1CT36TmpdvEkY4+TteCHnSXvDxo7s34eAUunpeILMQaXSTj2KhVCN 5wwR1mdgfz1xPYkMBVfPt6MIH27sHyZTwsS8gNBropZSG5m9vGtBYkxZB3UWVkqrcpvR bK4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697883301; x=1698488101; 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=zu42pQJStzejxYxI5j1H3uBlC7qEy33j9WdXMX2X/AQ=; b=p00OYFca56QxJ4ErRcE2CyBnCowauUizGKYdrMT0cB5MyQjP29SVrvM6eOzWumKbQf eda5l4k09gPiiwFTMZyer0S6GKWs+TKoEDelVr0F3A0lh0vmB2N2szyIMEE6eoYkexat nxaiK+n0wtuEezki/AwiHQqMmvNv8UY70DSkey+yP/RQhf1pU3+zKC8/zqofL93jf7V+ H+760N7mtGbovXpWOBwzMonkK3rFk4SnsUHVAxIi1iJjEixkQ4pNZNTg1keqQ95xI/q4 LfcR1lJBTB2Ct8m/iwkKqUNMxR979KeOJh19KoA7BGnhOWjXHreyaDbGvaCItoFxaM10 m31Q== X-Gm-Message-State: AOJu0Yz63Z+dWOs5ZRLM7ZkUIUz+OwDUGIus1AZo3wecvUgUbfkY1iAQ xQrXBDhvPLhFgFwjy0wEjQs= X-Google-Smtp-Source: AGHT+IGEyGTqzXkocVX8/ecMNUuRxdd4+0q8gLRjkZ0gbP18EcvYStdDZo6L4lsZwM58quVnjk+OIg== X-Received: by 2002:a05:6512:3b9a:b0:507:addb:c7a1 with SMTP id g26-20020a0565123b9a00b00507addbc7a1mr2641881lfv.14.1697883301146; Sat, 21 Oct 2023 03:15:01 -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.14.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:15:00 -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 3/7] staging: octeon: Fix introduction of following new typedef cvmx_pow_wait_t in octeon Date: Sat, 21 Oct 2023 12:12:34 +0200 Message-Id: <20231021101238.81466-4-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 the following new enum typedef cvmx_pow_wait_t and fixes up the implementations that 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/octeon-stubs.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon= /octeon-stubs.h index 40c357c77679..a11cbfec4d35 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -233,10 +233,10 @@ enum cvmx_helper_interface_mode { CVMX_HELPER_INTERFACE_MODE_LOOP, }; =20 -typedef enum { +enum cvmx_pow_wait { CVMX_POW_WAIT =3D 1, CVMX_POW_NO_WAIT =3D 0, -} cvmx_pow_wait_t; +}; =20 typedef enum { CVMX_PKO_LOCK_NONE =3D 0, @@ -1342,11 +1342,11 @@ static inline unsigned int cvmx_get_core_num(void) } =20 static inline void cvmx_pow_work_request_async_nocheck(int scr_addr, - cvmx_pow_wait_t wait) + enum cvmx_pow_wait wait) { } =20 static inline void cvmx_pow_work_request_async(int scr_addr, - cvmx_pow_wait_t wait) + enum cvmx_pow_wait wait) { } =20 static inline struct cvmx_wqe *cvmx_pow_work_response_async(int scr_addr) @@ -1356,7 +1356,7 @@ static inline struct cvmx_wqe *cvmx_pow_work_response= _async(int scr_addr) return wqe; } =20 -static inline struct cvmx_wqe *cvmx_pow_work_request_sync(cvmx_pow_wait_t = wait) +static inline struct cvmx_wqe *cvmx_pow_work_request_sync(enum cvmx_pow_wa= it wait) { return (void *)(unsigned long)wait; } --=20 2.40.1 From nobody Tue Dec 16 19:55:00 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 EA44AC0032E for ; Sat, 21 Oct 2023 10:15:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231249AbjJUKPO (ORCPT ); Sat, 21 Oct 2023 06:15:14 -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 S231148AbjJUKPI (ORCPT ); Sat, 21 Oct 2023 06:15:08 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 418B9D71 for ; Sat, 21 Oct 2023 03:15:05 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-507be298d2aso2376653e87.1 for ; Sat, 21 Oct 2023 03:15:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697883303; x=1698488103; 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=tDD9F7uN2VF2x8OMQSha4YCHZj7a+MjcYdmT4MBIiD8=; b=Fofh6PcK/tXHtq1T7/l5ouEp4O6YxqLygHn2ja1Ict1G3RD1ooyUgNMkAsDLzo11rx i8IaQ8U3JFa9mVI2Q1vCvhmcMoFYlqEJQ3MZd+uI34feZDCC0ij0iuecZ+Ya7Vq7NCkE oLiwYizvUHXKrk+Kdmqf97cS8ZhVNrCUya3Bub9+CtjoLL3MsFxtrbvZqKkfwMeTbPWY gBevCoeqX5YNgw7YlFjsZ0E6LPdZFMEIZOZ4AXAuKe0Oc0PDTVBRd4lc0mTk/Zz3zDzC vBaVwYG0SvmNLTjUaozGl6rELF8Juad/6KrIvAU+obVilS9Tb7S3y2i8KlAhwNqjQbTK nQLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697883303; x=1698488103; 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=tDD9F7uN2VF2x8OMQSha4YCHZj7a+MjcYdmT4MBIiD8=; b=snE5BGfPV2Purp6eY6HQBhO+kzStHfNCZuFUTQrtkR+QbDEUYCgt66goYA38WOrwsQ hcAHU67mQCwqeJuo4HL74eWnrQiWv7twnn80Q6Qt6F5t+SRa0/fTPj/wGsWzK3vvn1Af 0StopQnYpl2JzmNl401qYk9N/pC1Zu0r7D4+Pb8+4nMy34qP2BwVLJIZfStp2cpWfH2h 13tqE91HnEVlxMAGu7BQbwRIXpX57xXNyfeUBN2ovjrmU0TcxHTtPBThZ13QVTTbDCuR Q1q8xNraE34DHAmwELgRirr+nH3Wl78do5Svw+FkfmVBMkyeVzVQ6mnkB5Pr8Aw4PDZW 7yBg== X-Gm-Message-State: AOJu0YylT9ML3wsZfHL9ULj8lMqv5MnQ526gN1DxFQNd0z+gHR1l8WG8 vjiuzHvAWXvpi3Ypc0JXFqg= X-Google-Smtp-Source: AGHT+IHX/Zvu0tJGvGX4KDIKit63ur6XFlLYyXpV8M0aVj608kZOXGkZi/aD1tKjQy5Ej7fNm+7NpQ== X-Received: by 2002:ac2:4a66:0:b0:507:9f69:e8d9 with SMTP id q6-20020ac24a66000000b005079f69e8d9mr2877890lfp.49.1697883303127; Sat, 21 Oct 2023 03:15:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:15:02 -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 4/7] staging: octeon: Fix up introduction of new typedef cvmx_pko_lock_t in octeon Date: Sat, 21 Oct 2023 12:12:35 +0200 Message-Id: <20231021101238.81466-5-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 new enum typedef cvmx_pko_lock_t and then fixes implementations that 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/octeon-stubs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon= /octeon-stubs.h index a11cbfec4d35..6c0196c1a9f6 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -238,11 +238,11 @@ enum cvmx_pow_wait { CVMX_POW_NO_WAIT =3D 0, }; =20 -typedef enum { +enum cvmx_pko_lock { CVMX_PKO_LOCK_NONE =3D 0, CVMX_PKO_LOCK_ATOMIC_TAG =3D 1, CVMX_PKO_LOCK_CMD_QUEUE =3D 2, -} cvmx_pko_lock_t; +}; =20 typedef enum { CVMX_PKO_SUCCESS, @@ -1381,12 +1381,12 @@ static inline union cvmx_gmxx_rxx_rx_inbnd cvmx_spi= 4000_check_speed(int interfac } =20 static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t qu= eue, - cvmx_pko_lock_t use_locking) + enum cvmx_pko_lock use_locking) { } =20 static inline cvmx_pko_status_t cvmx_pko_send_packet_finish(uint64_t port, uint64_t queue, union cvmx_pko_command_word0 pko_command, - union cvmx_buf_ptr packet, cvmx_pko_lock_t use_locking) + union cvmx_buf_ptr packet, enum cvmx_pko_lock use_locking) { return 0; } --=20 2.40.1 From nobody Tue Dec 16 19:55:00 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 86068C0032E for ; Sat, 21 Oct 2023 10:15:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231245AbjJUKPU (ORCPT ); Sat, 21 Oct 2023 06:15:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231195AbjJUKPQ (ORCPT ); Sat, 21 Oct 2023 06:15:16 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A902BD7A for ; Sat, 21 Oct 2023 03:15:09 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-507bd19eac8so2399698e87.0 for ; Sat, 21 Oct 2023 03:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697883307; x=1698488107; 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=WlDFm1A0ZxnZFxu7liRZfTzTOUGufRMA62jY0m2ti70=; b=Cm6DVO3/G5S18qkm8vFgVgbUb+gJGCsngLXS/bdUAjMZsSOAxRxeYmWuicZGJ1WTC4 7TK8hfbrsEnD2hkz0u1qVc7B3B6o43wfqJI5DUz8Q7sudpGq7PwVoH/f7aZVO5Gf++4Q BxI+XnKy0Ti2W6bPiPV7++KwVIpDhcsIrTEUPncaz0s30ZxcrqwDFrJ3IMM67o/Y21tp cXTiBLZyYmvuuZP6A7/7vjrHsucK1k8LIfhnjmhbBxoELocY0p7YlqdVUFzh5NNIqbPr daPXAZo2CmDOW86dyqJLpIMrEzNSpZ9Djz9wSnMgJdSKmeGM3sYeb82Q+yKYdYVz6xGx 1R6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697883307; x=1698488107; 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=WlDFm1A0ZxnZFxu7liRZfTzTOUGufRMA62jY0m2ti70=; b=Ke6SUgIu/q0w9Kly4MjE6fxKBLggXZx3ErUCyvSAMTagPr0TRPcWnmUGgUj2pFH+s2 l+k7Ay1GZkUF47+wzTWQ/nIylS08WO17pF6WahjcS/kieg4hYQIqheNeL6fnid8c+y69 E08jOD09x7a/t2PRYSPqbL7UkpsvlhWnzlqQizV6WQGx0ps/N5PmisDhCehC9loBDVe2 IzFAe8k2RnuZO7+CrxB3Kjc+flaQOIa78EBahfrieaBeacJ1Cw7z0LKFzMFGkl5tFc55 sbNgOeqVWBqv5N0bW84+VgcpAao7DoKOHeV3UcRJS2n4Y5StFY2bz+XFhPBtaF6qeJC9 oJMg== X-Gm-Message-State: AOJu0YyAJd0uqQfgkEBxl+B1EiXjvFIVB0akhQLJwcYJQX0YYQAGaoz0 qvDmgsocgusWCqMsOj/U0Mc= X-Google-Smtp-Source: AGHT+IGllfT3vKhWR+EL0kgG+v845jM1KXqcbLEVCj1CC59eCE2TaxI7oIKfUiAmgfxy6u3DETRb7Q== X-Received: by 2002:a05:6512:20d3:b0:503:74c:9446 with SMTP id u19-20020a05651220d300b00503074c9446mr3044220lfr.24.1697883307412; Sat, 21 Oct 2023 03:15:07 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:15:05 -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 5/7] staging: octeon: Fix introduction of new typedef cvmx_pko_status_t in octeon Date: Sat, 21 Oct 2023 12:12:36 +0200 Message-Id: <20231021101238.81466-6-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 enum typedef cvmx_pko_status_t in the octeon driver and then fix 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/octeon-stubs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon= /octeon-stubs.h index 6c0196c1a9f6..529a75ad7c67 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -244,7 +244,7 @@ enum cvmx_pko_lock { CVMX_PKO_LOCK_CMD_QUEUE =3D 2, }; =20 -typedef enum { +enum cvmx_pko_status { CVMX_PKO_SUCCESS, CVMX_PKO_INVALID_PORT, CVMX_PKO_INVALID_QUEUE, @@ -252,7 +252,7 @@ typedef enum { CVMX_PKO_NO_MEMORY, CVMX_PKO_PORT_ALREADY_SETUP, CVMX_PKO_CMD_QUEUE_INIT_ERROR -} cvmx_pko_status_t; +}; =20 enum cvmx_pow_tag_type { CVMX_POW_TAG_TYPE_ORDERED =3D 0L, @@ -1384,7 +1384,7 @@ static inline void cvmx_pko_send_packet_prepare(uint6= 4_t port, uint64_t queue, enum cvmx_pko_lock use_locking) { } =20 -static inline cvmx_pko_status_t cvmx_pko_send_packet_finish(uint64_t port, +static inline enum cvmx_pko_status cvmx_pko_send_packet_finish(uint64_t po= rt, uint64_t queue, union cvmx_pko_command_word0 pko_command, union cvmx_buf_ptr packet, enum cvmx_pko_lock use_locking) { --=20 2.40.1 From nobody Tue Dec 16 19:55:00 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 DCE41C0032E for ; Sat, 21 Oct 2023 10:15:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231328AbjJUKPc (ORCPT ); Sat, 21 Oct 2023 06:15:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231303AbjJUKPY (ORCPT ); Sat, 21 Oct 2023 06:15:24 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBB8DD55 for ; Sat, 21 Oct 2023 03:15:13 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-507a3b8b113so2369561e87.0 for ; Sat, 21 Oct 2023 03:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697883311; x=1698488111; 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=I6i+6Zk+Ae4u3p5f0EYLwQQbZ/ZK0ytUZDMopEzD3lw=; b=UL1ymv8QBAATvZ8NcsXAgBvff4xeaZBpNaeEkGr8k340XfhFJzXaaDsDx0XkQkeWvt qVZfFKp+wZx5pTrbi0VzI6votedZkaCbdw6m2r70xkGOhxDL/iZFK18gs2+5wqvXQ6ZZ p99gBWWnDBtBhnEx1+ZhM2CpdYZQEmCX88KjSKYvx54jjfisq35q82lvpd3+1blNsfC4 KOwuTzpBC/PjqhFp4seYgkLG4qlxGS9a4SOVfqG1wez21ZjTXCj2VNeQseU5RYC1CaLf iIJ6rm+wBKbTtNEo8sBN0GhDE60b9XjlUNi6FRKm+s66aLxUuM8qnV5tQm0EOPJ4/sH8 GtGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697883311; x=1698488111; 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=I6i+6Zk+Ae4u3p5f0EYLwQQbZ/ZK0ytUZDMopEzD3lw=; b=hFndHe4p9Yiws8CVaItIdNcbKF7jj5YXNf/MQcHMv/H8OiXKLAHXBiMCDjLEgXMMv7 AJcx49XGL7fd2hM0gKNp1ZuBwz8nfkcM2H88d/se4KVJCE1Tk5eXn0EtwXjrZvmkke92 /+3Vpv8gjEHmFzLD9spJEfcxFULW5w3KGh2Nnu9bp5WZEPQs7VQpOgp22gd2ZZCC28ck /ylHrKNGdEU+s1HfvlxQcpfJuyppc9/+GhPSDTKTATqziKwNdog6QoA+STEv7wHp8vkB sBoTeBhXo7EMQ9S9hDXvewgOnxVcyAg2UbSI0Z4+OnzBHt95gLf13hJAsTSEqaeYSmKa LoUA== X-Gm-Message-State: AOJu0YyqnSuf9L1bGz/M0pWiqBXQFdSnyv25kC8GXUv1mVHQZSqb3YJz JcZSWgKvLRd/bAAF1ZPWMUA= X-Google-Smtp-Source: AGHT+IH/l8Jv8bNGei7moOM9J2kF685y5VbgHCx+tiAV9AliL1SBJQQcShZdUEh/IG+XDb099XOZ7w== X-Received: by 2002:a19:500c:0:b0:502:cc8d:f20a with SMTP id e12-20020a19500c000000b00502cc8df20amr3052017lfb.27.1697883311508; Sat, 21 Oct 2023 03:15:11 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:15:10 -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 6/7] staging: octeon: Fix introduction of new typedef cvmx_pip_port_status_t in octeon Date: Sat, 21 Oct 2023 12:12:37 +0200 Message-Id: <20231021101238.81466-7-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_pip_port_status_t in the octeon driver and then fixes instances where it was used. 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 023b107e077a..8c48acab49e4 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -201,7 +201,7 @@ EXPORT_SYMBOL(cvm_oct_free_work); */ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device= *dev) { - cvmx_pip_port_status_t rx_status; + struct cvmx_pip_port_status rx_status; cvmx_pko_port_status_t tx_status; struct octeon_ethernet *priv =3D netdev_priv(dev); =20 diff --git a/drivers/staging/octeon/octeon-stubs.h b/drivers/staging/octeon= /octeon-stubs.h index 529a75ad7c67..33a0e1d5f961 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -384,7 +384,7 @@ union cvmx_ipd_sub_port_qos_cnt { } s; }; =20 -typedef struct { +struct cvmx_pip_port_status { uint32_t dropped_octets; uint32_t dropped_packets; uint32_t pci_raw_packets; @@ -407,7 +407,7 @@ typedef struct { uint32_t inb_packets; uint64_t inb_octets; uint16_t inb_errors; -} cvmx_pip_port_status_t; +}; =20 typedef struct { uint32_t packets; @@ -1258,7 +1258,7 @@ static inline int octeon_is_simulation(void) } =20 static inline void cvmx_pip_get_port_status(uint64_t port_num, uint64_t cl= ear, - cvmx_pip_port_status_t *status) + struct cvmx_pip_port_status *status) { } =20 static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t cl= ear, --=20 2.40.1 From nobody Tue Dec 16 19:55:00 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