From patchwork Sat Oct 21 10:12:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156423 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp214638vqx; Sat, 21 Oct 2023 03:16:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFitlDUT/5jFSSQyE/x0UohnZSfL78LUZstFmALaLcnp42x4g7zX8m6FZ0T8QBdeM1+n9QK X-Received: by 2002:a05:6a20:6a05:b0:16b:b4a0:e06b with SMTP id p5-20020a056a206a0500b0016bb4a0e06bmr4504271pzk.43.1697883388456; Sat, 21 Oct 2023 03:16:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697883388; cv=none; d=google.com; s=arc-20160816; b=fJaXUwCFyJXrUFnf1ICHd5glFRJpEEx7YyuCn9quLL9PEZrdHX15LbVJz7xIcOdf+u s5vzYBukVw7lPVY9V+Xc+cbv5vrpG0eggeBlf5/3tJilpmik0nLTUEkfMkXevGPFNnqx lURTv7gXo0MFLdJ4cexul6bNJKV/9jwucVRmjPKl6jgNOifTXi4LpaoeMTPx9EZFYyCq kvFSZRo1qGrzP2q+kVmDjrKzOTPduiUk2xJ9LmlPZ7S4yJ/4l7ikYnypLqX75og8WEW+ +XSbafsydPIrykNfvRjWK1Wm0sdHByw4/B/dru9BeAXHuOVQfTzWSKuyMQLX/pyLp/Jz e1TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=54U+E9W9K0OaBdlR5lzHV/a+8QqdJ6fYDyraEx8zyqE=; fh=a/s45YuhTFF9HDl6pMrSzwKLljh7BT0Fj9EfJNxFsCc=; b=oClCVL1ADzyIU9XoREN+UfafIJldZq45uOT3GudeHvzR5id4b9MBGG2TDFfmkvtaAy N87wpNCsmwWFGSHefIkfKAcnkwAdkrFGsKM0g5AaV7e8M3Lx/7/zd5hKhnDC+QAPzwhb lsVoGYfiW9YXsbAGjMmWydC69OIe/3AGT/A+mfxGocIRcivJ2Bl3Uu2SDkT/WWuE9wWU 3BQFE9PxnRbz8yqZXp44zgRUDxzmJxPh4rfeijx/8Myg4VcS3KrS1Ihsy1l+eSnp6JmL nA4iEohHuXoM0DDYXf8XrlvOcJnml6F0nGGJm43Ik8GP+ZYJR3TFIAupF0IanioVVYH7 TPpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=C4MXKvDb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id k34-20020a17090a4ca500b0026efcf5357csi3243730pjh.126.2023.10.21.03.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:16:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=C4MXKvDb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 1F51680BDE15; Sat, 21 Oct 2023 03:15:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230104AbjJUKPA (ORCPT + 26 others); Sat, 21 Oct 2023 06:15:00 -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-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 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sat, 21 Oct 2023 03:15:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780359772324735516 X-GMAIL-MSGID: 1780359772324735516 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 v2 -> v3: Break changes up into individual patches for each removed 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 = 3 }; -typedef enum { +enum cvmx_spi_mode { CVMX_SPI_MODE_UNKNOWN = 0, CVMX_SPI_MODE_TX_HALFPLEX = 1, CVMX_SPI_MODE_RX_HALFPLEX = 2, CVMX_SPI_MODE_DUPLEX = 3 -} cvmx_spi_mode_t; +}; 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) } 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; } From patchwork Sat Oct 21 10:12:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156421 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp214556vqx; Sat, 21 Oct 2023 03:16:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEqeMUVFOemLpZwMFdHEGQpZqIzTn29G5Hte7BX86s98mxZJEskRaslUJpLmkKBYXHhNhgx X-Received: by 2002:a05:6830:12d8:b0:6c0:abdd:a875 with SMTP id a24-20020a05683012d800b006c0abdda875mr4459909otq.18.1697883379171; Sat, 21 Oct 2023 03:16:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697883379; cv=none; d=google.com; s=arc-20160816; b=Wqh3EaPQWMQwClH5pbqTMLUSd1eYNFaxiK4rYkbzdHrTcbnFZ1kwj6zs0WKVCW/ufP qXIDIyxSCU5naIuPcaz83LzJgCz93aNG+sx566jHqHj57xbDD6gnZM7VYyM0t3tSx4DC MuIiJ35Yqb7a0FBk0rSQeojNd6odPcu5YUEPTD3DRu31eo3hLQMGgT0o+r+SuPT2YICu H/UAOrxi3b1y8NyRfa5wQPQZu0KJvWt+4zUNuin5G9vHWS11/iwjSG4NAB7sSXdw6JOC B2nCtddWXARfkBypnziTl1y7YPijLlXC8/QE6FV2hVCkIoh9oFcboEI/U0un/C2dB7lk ZqZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mA8KD11qpf6KZqgPVgnRyUQoU2OH4Y/VAnk/+JUKr/8=; fh=a/s45YuhTFF9HDl6pMrSzwKLljh7BT0Fj9EfJNxFsCc=; b=AFUsseeuOU6v4uxHI0x/HmFlc91qOnzZV56EkCljtBv33KlGxz/UaNxzIPOOew340M YOobyWvzZj1BLQN7lDAjAvNtvUZKOuel2WRLtEqQdtkpC8Sq9PZUSZUEHbtlagMxGDDR bysevzeum+lGz5iXHeQAofEy8GIiZkM0uVb2DOl4xlhV2fI3kTDgzaAi+6wfalrK9eGF HywpdeZtT6xiZ2bI3KDPFl8rcn49WWm9yLcQJ/R2x+8hvtUrIKaNvEkz9S2Qf/Db3Rti l7ml6pLdEHib4PVfH/TcIkp9nUoMUIL4sGSPifBRoVv267qmM25Cz2B5qKEIN6vpRC1g SsGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HsYRIDwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id d64-20020a633643000000b005855f67e490si3366237pga.690.2023.10.21.03.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:16:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=HsYRIDwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 2535780842CA; Sat, 21 Oct 2023 03:15:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230406AbjJUKPH (ORCPT + 26 others); Sat, 21 Oct 2023 06:15:07 -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-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 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 21 Oct 2023 03:15:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780359761880478820 X-GMAIL-MSGID: 1780359761880478820 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: v1 -> v2: Fix breaking change spread across multiple patches v2 -> v3: Break changes up into individual patches for each removed 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/ethernet.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) num_interfaces = cvmx_helper_get_number_of_interfaces(); for (interface = 0; interface < num_interfaces; interface++) { - cvmx_helper_interface_mode_t imode = + enum cvmx_helper_interface_mode imode = cvmx_helper_interface_get_mode(interface); int num_ports = 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 = 3 }; -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; +}; typedef enum { CVMX_POW_WAIT = 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) { } -static inline cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int +static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int interface) { return 0; From patchwork Sat Oct 21 10:12:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156420 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp214221vqx; Sat, 21 Oct 2023 03:15:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5Md7VGqKCpxAoj9AaZ3k4Vr9Rsi4TeZxU9dOPIXX7CtlLXk1bFCYQvKQk3rlVYA76HE2p X-Received: by 2002:a05:6358:50cc:b0:157:a791:53cc with SMTP id m12-20020a05635850cc00b00157a79153ccmr5111475rwm.32.1697883323257; Sat, 21 Oct 2023 03:15:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697883323; cv=none; d=google.com; s=arc-20160816; b=UkTjqM6pQKfprq3c7/SW5Wqs7boWJgDFjVGUoQf88mVrjfi3hiYLpWYYbJJn8/x+1X 6ezcB57EgTVC/SFCMV8d3YboKLh3a/wEAes3RhzDEJCBdE9E6agBuUsV32RXLuXFbcYN vI8sC5YUccu7liRU63t0sacUE3A+K69nwyqIGyJTtyXuL4sRSx2Rj3xvay77BhPrw60V FkkYpuOQuRWJQaq9T7GippHt3n3hbmm7xk6VxyCv8t7nGaoJVlSWw1XjxtmH0dOhzM5S xUsofacwJyAaDzC3T4z/aMHXZqn06cpTRyjzZq4itz1NHkU+zlAeqc3gKF3h72hKW/us Z5XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zu42pQJStzejxYxI5j1H3uBlC7qEy33j9WdXMX2X/AQ=; fh=a/s45YuhTFF9HDl6pMrSzwKLljh7BT0Fj9EfJNxFsCc=; b=j/dGybwU/5srH5iH31n9WwruLjt8BJGGjzvveySaPeHKrPxBW6HnN3f3ZKkRLheGQu spGSjEngMBUgzaC8T53o12tqUSBq0q+HmBptEGbQDp3YrlaFbcKuvBev0jEE80qjAhzx kTOs4Urgx835UbKn+KF2eV2odm9s+++XzwxcmEG92uzoNkUZKk4yS+GhoPX9C97Ni5J4 9rT7CKSCpbX0dXvFIoghiN40stW6XtPX6FfOXRGsLQ+d1eynQA/VZCKXEDjNoyumzWtI AOVg9N0RIk/n2bhRzAJcWBUbVd3OB17WufFjOZzAJr1cjzd9/Ri7bOn9xqjkVJRPiT34 R/iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PrA+QRxj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id c71-20020a63354a000000b005b83bdb2664si3435518pga.541.2023.10.21.03.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:15:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PrA+QRxj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3F53D80793F1; Sat, 21 Oct 2023 03:15:20 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231171AbjJUKPK (ORCPT + 26 others); Sat, 21 Oct 2023 06:15:10 -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-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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 21 Oct 2023 03:15:20 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780359703442704502 X-GMAIL-MSGID: 1780359703442704502 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: v1 -> v2: Fix breaking change spread across multiple patches v2 -> v3: Break changes up into individual patches for each removed 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, }; -typedef enum { +enum cvmx_pow_wait { CVMX_POW_WAIT = 1, CVMX_POW_NO_WAIT = 0, -} cvmx_pow_wait_t; +}; typedef enum { CVMX_PKO_LOCK_NONE = 0, @@ -1342,11 +1342,11 @@ static inline unsigned int cvmx_get_core_num(void) } static inline void cvmx_pow_work_request_async_nocheck(int scr_addr, - cvmx_pow_wait_t wait) + enum cvmx_pow_wait wait) { } static inline void cvmx_pow_work_request_async(int scr_addr, - cvmx_pow_wait_t wait) + enum cvmx_pow_wait wait) { } 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; } -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_wait wait) { return (void *)(unsigned long)wait; } From patchwork Sat Oct 21 10:12:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156422 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp214563vqx; Sat, 21 Oct 2023 03:16:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IER1J8nQqQGxhOo/+jnB8Au86TGe72xsFteMqkbrFMTT3Xrmmluk6INuqGILlVOdlNmC1hc X-Received: by 2002:a05:6358:342a:b0:13c:eea2:d021 with SMTP id h42-20020a056358342a00b0013ceea2d021mr5516153rwd.9.1697883379855; Sat, 21 Oct 2023 03:16:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697883379; cv=none; d=google.com; s=arc-20160816; b=02XBf1HmVNPt8Tljmh6FQ3ElrqPNMfN1bzMPjv37TRegxATucO9s7hdsx6OnRyuk2M u+stkMw7iCheM+0zxQY0tMLUo3eTDWqh2mqhXon21+PAaEj3rjujmyABWkKYn13MJw/A 8HviYSYq6bm+WDN9wt9hq9z4WtDOj0oPHYTUSZz/dKT3j6nhmNH3XqRJ/jTHy6KlRIWr vR5g5oJOKztbEQ7Iv1sGl4RdJw4wHbx3+e9YOxfizaeyzxk2ri/ynnL9ic2fZir3kNS1 qAP9D0SFOxzXCpdCv2F/X6MBa1WY37+42+AVKlJlRSlS9mvBCn8ayzb2fSHAa6M7Pv4c aSiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tDD9F7uN2VF2x8OMQSha4YCHZj7a+MjcYdmT4MBIiD8=; fh=a/s45YuhTFF9HDl6pMrSzwKLljh7BT0Fj9EfJNxFsCc=; b=T4LLt4U3GQFJLvNCW/q5ohY59a3REj1gDN1bJHU3leK8yJzGB1Kzj21QpVTwwVYMrQ q48U3O11UOq7ua2SL/yVaIs7O0eQM4MO11EnGoGBYD+DNRqmDWnZE9l5E9HTyIX8Vhxl OXv0ut5vHBa5az2YwQ05AcACcmdF+Ci/F9R06ue8HjGxXd6fTbN2YaW2M26srt2P6aGB BIYV78FyVSASL1VAS8I3j4w6ZBrRD5DrhSUzZKyMKB/RIrzIme2ZFu9PhG3vCqfG08a1 abPoRi9WlCBpteHt5p0S3LbkHDMDdP06coRvfUUZcMppqKkI8iuUOaqyHxKj0xxmoAIu Jo7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Fofh6PcK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id t4-20020a63f344000000b00563de199314si3395341pgj.896.2023.10.21.03.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:16:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Fofh6PcK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id B840C808D4AC; Sat, 21 Oct 2023 03:15:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231165AbjJUKPM (ORCPT + 26 others); Sat, 21 Oct 2023 06:15:12 -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-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 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 21 Oct 2023 03:15:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780359762939528190 X-GMAIL-MSGID: 1780359762939528190 This patch removes the new enum typedef cvmx_pko_lock_t and then fixes implementations that used it. Signed-off-by: Jonathan Bergh --- Changelog: v1 -> v2: Fix breaking change spread across multiple patches v2 -> v3: Break changes up into individual patches for each removed 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 = 0, }; -typedef enum { +enum cvmx_pko_lock { CVMX_PKO_LOCK_NONE = 0, CVMX_PKO_LOCK_ATOMIC_TAG = 1, CVMX_PKO_LOCK_CMD_QUEUE = 2, -} cvmx_pko_lock_t; +}; typedef enum { CVMX_PKO_SUCCESS, @@ -1381,12 +1381,12 @@ static inline union cvmx_gmxx_rxx_rx_inbnd cvmx_spi4000_check_speed(int interfac } static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue, - cvmx_pko_lock_t use_locking) + enum cvmx_pko_lock use_locking) { } 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; } From patchwork Sat Oct 21 10:12:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp214807vqx; Sat, 21 Oct 2023 03:16:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESawz4W9N3RlL7kHusfp/H7vHMr8djqvodxE0afHUFhLEg6x4ifVmTCC50cNdSb4cuMhW/ X-Received: by 2002:a05:6830:4104:b0:6be:fd1c:c228 with SMTP id w4-20020a056830410400b006befd1cc228mr5537846ott.1.1697883418678; Sat, 21 Oct 2023 03:16:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697883418; cv=none; d=google.com; s=arc-20160816; b=EYDtxASRMogeSieSWpRb2AXP8HOcipWXzyhENI2StTq9L/ScbLRGM81JiUwrhzL09V 4GQRimDm7z/GN4oSjGsWis5BJ/0xf+96noRkMi8gxL3I3tiotz5ZVdgxYdZMOfEa3YY4 Cf8+hmIDHs34D+AAUir1Dzq1ML5P8LBWk6hqi9wq+hWEGxcI9Wia+ViT1vBMYk3wem7r KaPqJ9pKFY021ameXozpRgIS7DMxWiHFlIchBQfzsRDtVCUx8IctEEl4/o+jI89zSg1d g9P5tHJQpdlwOIiFWU3FR21xrOtsuVasa0HT1y6YvDKZTqb6iEOcawjtpsxH+jTDMgTA 5aOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WlDFm1A0ZxnZFxu7liRZfTzTOUGufRMA62jY0m2ti70=; fh=a/s45YuhTFF9HDl6pMrSzwKLljh7BT0Fj9EfJNxFsCc=; b=erle8tmFmsCuBvZI+wT/9/ocCc8k5P+iQM1IFD5XdJHfAwv8HyagcA/0G+oCrz8lTA j4ujAdKqmnfovBkuYUuGTvf3m42W/uI4H0E/YyY2JRvCnFPvLtrfaD2F7mi8xv1tF0C9 xWuLOSjycc51Cvivmw2z6sw/6k1ds8Xb7/zPdV8Ro3Us7USo2+nnG9a/uU/oNJ82J7Ij V/hrnFArGRz2xqNh4Ov5giXvZj39mAFuQAdFbUgVnZTAppS1kgHudEYyEtmZn7SV1TbY wmkwxLWt1DKrmxlfMVZyg2n87CUMlUqXpo4mR/9ELA2gpVKNpToQwb3G1LEzv7j1j7oB GS3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Cm6DVO3/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id bv125-20020a632e83000000b005859c81f1e9si3398215pgb.229.2023.10.21.03.16.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:16:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Cm6DVO3/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 87AC5809580B; Sat, 21 Oct 2023 03:15:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231186AbjJUKPS (ORCPT + 26 others); Sat, 21 Oct 2023 06:15:18 -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-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 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Sat, 21 Oct 2023 03:15:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780359804030357836 X-GMAIL-MSGID: 1780359804030357836 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: v1 -> v2: Fix breaking change spread across multiple patches v2 -> v3: Break changes up into individual patches for each removed 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 = 2, }; -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; +}; enum cvmx_pow_tag_type { CVMX_POW_TAG_TYPE_ORDERED = 0L, @@ -1384,7 +1384,7 @@ static inline void cvmx_pko_send_packet_prepare(uint64_t port, uint64_t queue, enum cvmx_pko_lock use_locking) { } -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 port, uint64_t queue, union cvmx_pko_command_word0 pko_command, union cvmx_buf_ptr packet, enum cvmx_pko_lock use_locking) { From patchwork Sat Oct 21 10:12:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156424 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp214658vqx; Sat, 21 Oct 2023 03:16:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHP1NYls4vai4V78T60UerIXjcxc8v5AXbnudA2yFHc8a4ghCVU38gEHQONraJgi+5xNPfn X-Received: by 2002:a05:6a20:daaa:b0:16b:d853:9a10 with SMTP id iy42-20020a056a20daaa00b0016bd8539a10mr596164pzb.39.1697883390914; Sat, 21 Oct 2023 03:16:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697883390; cv=none; d=google.com; s=arc-20160816; b=XT/d7L2i/awzX9+PZDtThzWWxrZpEsFMc6Cixh7FpCM0YP1lnRCkEQKtHr8b+pZP8X 45sTUmM47YWgXww8lpI964iFV0BdkrAxltGQ7U0xjXvhv/jpSA+xtrTj/fPGJXnXGmFh zrdRqnLmoPVnrY1hZLuBJLNRM071iKFBhcKjgHRYv6cUE/1IkbPSYxNo+HefzbbXOCd+ bRzpSb/9iz3hFJ8E10qU7bJ/t3WX2hLZOb0UtOX2zhXLVpvdjvkUfoZ3aeTsDQPeHmja EtVWwEYQT+tvCI9mcomC45JiV5t8JTf8IVSEiE5UoGX6yY31Bxt+PYUgq0gavW8qGzRe 6DrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=I6i+6Zk+Ae4u3p5f0EYLwQQbZ/ZK0ytUZDMopEzD3lw=; fh=a/s45YuhTFF9HDl6pMrSzwKLljh7BT0Fj9EfJNxFsCc=; b=DjPb+MdgkZE7sH3IXmXA/2AtfWAzdAqdubipcy8CaSYPZlRhLFXmZnv6PFHnEZ2w55 yzKQdp9PjeJb3cZwBx6te75a7PQZO1DH1Fi+rMQMpfQbduJYKK3g2b+r5u8iud6smcji xnz3itZs5wiJiIHOLclIAzIjybJ0weqHuVJUJLGFLHBiAEMTTZV+MRPS+GgGXSRYwK9x Ud74fmWSKn+W1KW4TGOFWTy4RpxZ1kzUMoSMAbqD7ixjguTX27XL7AFv5fe3R1Jfn1LZ L4qWFFr4FFmhEmLU97bHqC5W9S3KfJPuLpFbDTmvzBhy0g0gI6XFpb9oCBbmGCC9uGJD G8+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UL1ymv8Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id h17-20020a633851000000b005abfb781154si3459468pgn.97.2023.10.21.03.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:16:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UL1ymv8Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 2607480BEDF4; Sat, 21 Oct 2023 03:15:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230406AbjJUKPa (ORCPT + 26 others); Sat, 21 Oct 2023 06:15:30 -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-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 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sat, 21 Oct 2023 03:15:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780359774258589193 X-GMAIL-MSGID: 1780359774258589193 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: v1 -> v2: Fix breaking change spread across multiple patches v2 -> v3: Break changes up into individual patches for each removed 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/ethernet.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 = netdev_priv(dev); 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; }; -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; +}; typedef struct { uint32_t packets; @@ -1258,7 +1258,7 @@ static inline int octeon_is_simulation(void) } static inline void cvmx_pip_get_port_status(uint64_t port_num, uint64_t clear, - cvmx_pip_port_status_t *status) + struct cvmx_pip_port_status *status) { } static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear, From patchwork Sat Oct 21 10:12:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Bergh X-Patchwork-Id: 156425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp214669vqx; Sat, 21 Oct 2023 03:16:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHUrzhHC1T/aZp2dz8gjnizGhcU4GmC6fXRT4+04o3cZOgXqgTd+yKkZ6QPHcvz5odxzPRb X-Received: by 2002:a05:6a20:7495:b0:13f:13cb:bc50 with SMTP id p21-20020a056a20749500b0013f13cbbc50mr5962463pzd.25.1697883392162; Sat, 21 Oct 2023 03:16:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697883392; cv=none; d=google.com; s=arc-20160816; b=yq9qOgwCANTbq5cBjURcDX60PKYp9umjU7kxJgt1m5tim58D4W4erHUzU3xnDXfN9G yaTrJW3/LlUA8ZtWCaYhHhSJGtMKRnUDc+tBAHnAo/1ny35JSUlz/j7IKgXrrzELqPCA e/iJHD2bEiQRs99mUcoGzPOHgCw5TlxNViUzG3WVxxPnat5YPpK5jEEjifofRaizOLAO 859n3UCmmMvyoA+8QwRe9c32A45o44B8Vpo3OZMt3FqHUI+lT/2RXVTTOnRIEEV94Jqp 2BWMmgCZqQEY8YqEaGNCveed+8BMDQbIFlqAhUF8wAhXZtJDEwB1VHeT8F/cuANe7HJ/ me5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OzDHqn7UNaJzOjgCcjrENJmpRSweOhwpG6H5CfyFDbc=; fh=a/s45YuhTFF9HDl6pMrSzwKLljh7BT0Fj9EfJNxFsCc=; b=Vky7rkjFfbpMS7kSkBPUfoMT708n0w9YB0fF/ADbeo7ToNCgq16RUD5ewHptehV2Qs lXvAcnUr5/kp0SPkHxichnBTZMA2bFUAS5RI2cxgVqTrS5abO4v3HmJX2tP8NK/Xo0sf 0+kOlV+mZSqJN+k0x2pjGjNCbCojIBxQZIGOjdAIJWiS2TEQ5UfcuqMLyy/JlKAv2oBC ASMaW5jTJbKZLQlrKEeXSVap8KkldTOYVKg9amwHEjg8fXr4prqHKt9JBoTTl8liQ27f eXpktxZ8e/gwl71Y2P9rtt97H36zNPZHQ2WZfQ2ZTFKLfNKWr4v8C9yQEtFvOHhZGhAy O2Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DgcHoxtW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id bl17-20020a056a00281100b006b9c3f8b912si3271663pfb.52.2023.10.21.03.16.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 03:16:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DgcHoxtW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 16EF8806BC1B; Sat, 21 Oct 2023 03:16:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231148AbjJUKPg (ORCPT + 26 others); Sat, 21 Oct 2023 06:15:36 -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-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 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sat, 21 Oct 2023 03:16:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780359775843773510 X-GMAIL-MSGID: 1780359775843773510 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: v1 -> v2: Fix breaking change spread across multiple patches v2 -> v3: Break changes up into individual patches for each removed 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/ethernet.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 = netdev_priv(dev); 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; }; -typedef struct { +struct cvmx_pko_port_status { uint32_t packets; uint64_t octets; uint64_t doorbell; -} cvmx_pko_port_status_t; +}; 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, { } static inline void cvmx_pko_get_port_status(uint64_t port_num, uint64_t clear, - cvmx_pko_port_status_t *status) + struct cvmx_pko_port_status *status) { } static inline enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int