From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37BEF3385BE for ; Mon, 27 Apr 2026 15:54:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777305279; cv=none; b=IlLOa5FANRK3HKTbIYhy72/d/3Z007UeQFqbTIdX27aCytFCQffbp5dRNxVHPfzeq7sn3TxPoWfVZatfPBEj0iMk9ZEzO5ChaZs0KYsmdq440VaagYcp8Inn1fKbnw/0tArZvHO6RnugoTJ9NMB83Wx6ROn2YoEJuMNk102RU0Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777305279; c=relaxed/simple; bh=RFwtc+DWnFArVH3yDlpvTx4fUm7z+0DYCBQcxeZkztg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DgFQKATolKhPbkILdqni+xvvdE8Ywfb+Ybc/Lb2LVqemfCG9mGDorohJmc+KSipQqQd9UjfLbolltiEGfHA2KsRQvFHymzgDhXmsrFEWx1g4OpoBmJObm52hw5peqK7BPvMBblSsPVf8Wd6Zh5aDU/aKH7TaYtLClqa/JbyytJQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jAjRY3Up; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jAjRY3Up" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2ad4d639db3so51125445ad.0 for ; Mon, 27 Apr 2026 08:54:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777305278; x=1777910078; 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=AM2ciHe3IZQx3bTbi2nzxHzfQ0F42LMlFGioqZ6RPhA=; b=jAjRY3UpFLLPzqYxi0LjtNkDVl0VQOyUqzRQMWBNmSI84wBf549v5RLd99LxXafJDd vdALHIfPINb8Fl/wKX5079TS32+QZoHBZDMKrPRHDhhmQTn0N9pKnov37lTtbMSGZ28B cV+K/0XQ6JFC9iosVJvqpWgUugnm33DOlWxGhUC03o31j0xf/XKGrb7bt0KF3+ABUTPe M0GsFQm+ZLLg/bsZfmKEYEZUjLoPDdOehO30LcHZcCv3b7iNnvPTCF33PI4R8YI5bLcR eYhpXN5ngp/bvewOi6+pDo4XXnuDX5n85lzrceIjyyqvrpBs00HUiwHwX6lazvTbhE4V qhDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777305278; x=1777910078; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AM2ciHe3IZQx3bTbi2nzxHzfQ0F42LMlFGioqZ6RPhA=; b=eZwwSm4fB/HOGouid0XH4ULxMRkrhHocJGtCtcB9vd2QfWmv8KtKpzw63/lPdi37dm SjJH+lRnHD6uB0oQlpaEGTYs+i6h2+p5/7cO6oc+JYi6DhP8JTBN5W51zVkzDSwYUFNV aTF9bwUborRE6G2QfxB0NbqxLQh+nr3NYLi1gt7O/y9fmgfQVYMJ/ECbjyWYEdtT6MoH 6YYEHEFg1NzIX8KUIMJCy54reDsqmPB3DuQV9BmJ6nkxDUdhETLjTl5xJhdC10oSVWqJ uEJ2LR6J+m2OnyDBALLS7/UfQeMa/8K1RwV0eyp3SCRM70gioMQGCKzaDmlwl53+J3wC SCtg== X-Forwarded-Encrypted: i=1; AFNElJ/N4zEMXsW0F2VwhTOTBRv/hkeQu45SCr+bQo/R2bl2q1teiVsq38JaOxjmuQhDyXumzmmZwSjG29vD8rs=@vger.kernel.org X-Gm-Message-State: AOJu0YzSLWZq76XfJZBu47/hCTKzMo6XL5T6v/KZxBLN76TYnudYjXl5 ekczi7uVMJwAzzKyzxMuRP9jCIeoh2zZlk50uxyI7ZMvqkErNlvmyYUp X-Gm-Gg: AeBDieuycaICT6W+MbezXLi73ut28/HiqAveiWt2Yex/OvxFiaRwK41U/MoWJogNaWc xOOwn41I32+nkQ2H+B7tQUwIJtvE+5Ledenl1KKASENpr8zqVLz/BIUWErydYpqd0vo6jhqHQHA +fpI7AxBfJYQ00wZC1Op3FXIGKNf1VtgiobxvQZrScfQ/kWRC7qX7naStl2591PxpMS6rnSIr4Q yecvj6/G6uSOEdkrmpfvGGxcEgsdNfJvGRGcBMd/yIof3MhUkS1RXyaEH0eMS3ixkSjTV5Vp14b q1clvPc23ryd0R333P5CIeg9VEp8WKqlvXn7pjFBDSaZY/z+NI5IGBJMz46umGj9jrQBiO+6xi3 pZ4uZGhWnITwMrfpwNLSbVJOyBW8cU4oO4Mm1KFC8ICoNOHwnUAVILLgXyKPtG8YToCErEwqNPD KN2DUrBMQ8kbHJ+vz8weDzku8aJUWWA29jPBxemu8fkYxxrJ8GMT4= X-Received: by 2002:a17:903:2acb:b0:2ae:450c:951e with SMTP id d9443c01a7336-2b5f9f08968mr469184115ad.17.1777305277630; Mon, 27 Apr 2026 08:54:37 -0700 (PDT) Received: from localhost (vps-e1cc9378.vps.ovh.us. [2604:2dc0:202:300::1365]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5faa2df0asm309250075ad.26.2026.04.27.08.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 08:54:37 -0700 (PDT) From: Eric Wu To: Thomas Bogendoerfer , Greg Kroah-Hartman Cc: linux-mips@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Eric Wu Subject: [PATCH 2/7] staging: octeon: convert cvmx_helper_interface_mode_t from typedef to plain enum Date: Mon, 27 Apr 2026 23:54:22 +0800 Message-ID: <20260427155427.668540-3-kunjinkao.jp@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260427155427.668540-1-kunjinkao.jp@gmail.com> References: <20260427155427.668540-1-kunjinkao.jp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The Linux kernel coding style discourages the use of typedefs for enums. Convert cvmx_helper_interface_mode_t to a plain 'enum cvmx_helper_interface_mode' and update all users across the MIPS Octeon architecture code and the staging driver stubs. No functional change. Signed-off-by: Eric Wu --- arch/mips/cavium-octeon/executive/cvmx-helper-util.c | 2 +- arch/mips/cavium-octeon/executive/cvmx-helper.c | 8 ++++---- arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +- arch/mips/include/asm/octeon/cvmx-helper-util.h | 2 +- arch/mips/include/asm/octeon/cvmx-helper.h | 6 +++--- drivers/staging/octeon/ethernet.c | 2 +- drivers/staging/octeon/octeon-stubs.h | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c index 53b912745dbd..abaf91f6ae7c 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c @@ -52,7 +52,7 @@ * * Returns String */ -const char *cvmx_helper_interface_mode_to_string(cvmx_helper_interface_mode_t +const char *cvmx_helper_interface_mode_to_string(enum cvmx_helper_interface_mode mode) { switch (mode) { diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c index 9abfc4bf9bd8..1985cd66806a 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c @@ -95,7 +95,7 @@ EXPORT_SYMBOL_GPL(cvmx_helper_ports_on_interface); * @INTERNAL * Return interface mode for CN68xx. */ -static cvmx_helper_interface_mode_t __cvmx_get_mode_cn68xx(int interface) +static enum cvmx_helper_interface_mode __cvmx_get_mode_cn68xx(int interface) { union cvmx_mio_qlmx_cfg qlm_cfg; switch (interface) { @@ -147,7 +147,7 @@ static cvmx_helper_interface_mode_t __cvmx_get_mode_cn68xx(int interface) * @INTERNAL * Return interface mode for an Octeon II */ -static cvmx_helper_interface_mode_t __cvmx_get_mode_octeon2(int interface) +static enum cvmx_helper_interface_mode __cvmx_get_mode_octeon2(int interface) { union cvmx_gmxx_inf_mode mode; @@ -247,7 +247,7 @@ static cvmx_helper_interface_mode_t __cvmx_get_mode_octeon2(int interface) * @INTERNAL * Return interface mode for CN7XXX. */ -static cvmx_helper_interface_mode_t __cvmx_get_mode_cn7xxx(int interface) +static enum cvmx_helper_interface_mode __cvmx_get_mode_cn7xxx(int interface) { union cvmx_gmxx_inf_mode mode; @@ -289,7 +289,7 @@ static cvmx_helper_interface_mode_t __cvmx_get_mode_cn7xxx(int interface) * Returns Mode of the interface. Unknown or unsupported interfaces return * DISABLED. */ -cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int interface) +enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int interface) { union cvmx_gmxx_inf_mode mode; diff --git a/arch/mips/cavium-octeon/executive/cvmx-pko.c b/arch/mips/cavium-octeon/executive/cvmx-pko.c index 6e70b859a0ac..760abbe12479 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-pko.c +++ b/arch/mips/cavium-octeon/executive/cvmx-pko.c @@ -120,7 +120,7 @@ static void __cvmx_pko_port_map_o68(void) { int port; int interface, index; - cvmx_helper_interface_mode_t mode; + enum cvmx_helper_interface_mode mode; union cvmx_pko_mem_iport_ptrs config; /* diff --git a/arch/mips/include/asm/octeon/cvmx-helper-util.h b/arch/mips/include/asm/octeon/cvmx-helper-util.h index 97b27a07cfb0..103bb5b3142b 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-util.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h @@ -42,7 +42,7 @@ * Returns String */ extern const char - *cvmx_helper_interface_mode_to_string(cvmx_helper_interface_mode_t mode); + *cvmx_helper_interface_mode_to_string(enum cvmx_helper_interface_mode mode); /** * Setup Random Early Drop to automatically begin dropping packets. diff --git a/arch/mips/include/asm/octeon/cvmx-helper.h b/arch/mips/include/asm/octeon/cvmx-helper.h index 0cddce35291b..98824ff6314c 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper.h +++ b/arch/mips/include/asm/octeon/cvmx-helper.h @@ -38,7 +38,7 @@ #include #include -typedef enum { +enum cvmx_helper_interface_mode { CVMX_HELPER_INTERFACE_MODE_DISABLED, CVMX_HELPER_INTERFACE_MODE_RGMII, CVMX_HELPER_INTERFACE_MODE_GMII, @@ -49,7 +49,7 @@ typedef enum { CVMX_HELPER_INTERFACE_MODE_PICMG, CVMX_HELPER_INTERFACE_MODE_NPI, CVMX_HELPER_INTERFACE_MODE_LOOP, -} cvmx_helper_interface_mode_t; +}; union cvmx_helper_link_info { uint64_t u64; @@ -125,7 +125,7 @@ extern int cvmx_helper_get_number_of_interfaces(void); * Returns Mode of the interface. Unknown or unsupported interfaces return * DISABLED. */ -extern cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int +extern enum cvmx_helper_interface_mode cvmx_helper_interface_get_mode(int interface); /** diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index eadb74fc14c8..5f9c29071fab 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 289a2d41fdc5..6c0329270464 100644 --- a/drivers/staging/octeon/octeon-stubs.h +++ b/drivers/staging/octeon/octeon-stubs.h @@ -222,7 +222,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, @@ -233,7 +233,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, @@ -1267,7 +1267,7 @@ static inline void cvmx_pko_get_port_status(u64 port_num, u64 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; -- 2.43.0