From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.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 E0239330676 for ; Sun, 28 Jun 2026 07:01:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782630109; cv=none; b=pYkbG2xcHDR4e8zGBGmiZU4CLUpnDpR2lLjLtRhbTN1Fo+pkJH9As26WENkc8NhtqWfBi/c+zBT9fhvoijqyNmG+rYBQaAPH44WWALywtgm0IBE5fKhXcPIdZVL7FcPkkK/EloXeW/IWmC6ZxWSdyo9ht8ePCLCA0I20bAbYepw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782630109; c=relaxed/simple; bh=qmJ1u5i7dUxtk1Om5Jtki/OJy4eDe0UdEmPjGhr7Ji8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gyplk5QLhIjQ3znMya5ELIL4yhb2+S+Z7FNcD/kXlfvQXtNOcXQx5tlN4tqZaBBGhEokI3m2cex9mB1jIYpPi5cG2lmFCvCzaoG8tfiAnA7jO9u8ta5F29m7gS//v92R8Z6jUnxgwAd/kECpWwt0g2fu4kpmsu6ReP0w2x3aFBU= 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=gT9OormA; arc=none smtp.client-ip=74.125.82.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="gT9OormA" Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-30e9eefa268so1521442eec.1 for ; Sun, 28 Jun 2026 00:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782630107; x=1783234907; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=QYfs/uXnRVPNQ7LHpddf5rjRf2cS7Tft/Nd/ILvU5x8=; b=gT9OormAQvucFjMF6oeKRlwGUzFCyBnZQ3Hl435oDHOELhXLqkXuBu7P/W7GseXNqn MxTAjNBhpOtmazuHOjweAWj3uLSNAw0+yx+LSrfnFKS7NZXnOt6xpJvWRx26e0FtmwSS 1ArzDdRtsNjR8CVCt4qingVGD7lfYo+TfGvh/g4GHcCbM8UCWLkD5nT2Bxhlv2M18Obc ZoW6VX6Jir1TqPjK71zFgZm6U+VK/frh7qA959/QcACS+kUC/6BUuq7VU0zmLI4V/nU+ tBGZe/lBX46CsN/F3PhywNR918+HU3UMm5G6kxjs8UKLhcpUgn/qFlSmHeP/RYADsA8M wrcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782630107; x=1783234907; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=QYfs/uXnRVPNQ7LHpddf5rjRf2cS7Tft/Nd/ILvU5x8=; b=k6pYRajiODfXVYcYbOm0hBtEF+O1Y5/zkBcOPYZI8afRTFnyLmXlPfPEhP47kZtxrz 7xKAUvfd7r7YJEuPXPyLhebjCQbhNsckchZSDlMEL5pZEK20Ue214qaiFz02mnVRhhq9 ncbFNgdvPEJVP38ArdsSc858cWBgE1/LTeUzAWlD5kaEFTu3SG7lTSXq/ZrgkD1r+Ndm aeUL0o5L74c2nTvgpZrhtF537A5Sklga2H8xwxLsjYZM4IN1xMAbdEwFD1nqG3frN5/i kczsrY3X6wY8SOs2G1qoCYQfAKiHb6eembmQLvcQ8iHGJzVNY8rfXvrtEs+G1BCOkGrl YkQw== X-Forwarded-Encrypted: i=1; AHgh+RoBz9T/TLttC41Gn0tRgHcEeTofXAUY/Jjfh6rl6HyMuI9rZegE/5N+TSGmzgN1lDBqB7OTfRHyiDtzL7M=@vger.kernel.org X-Gm-Message-State: AOJu0YzO6w7fZ3qFicktu4cjyW6+55/61R25U58rJYDEib0zzyyKe5Ct ElVPmFuf8CMxRSMV8apCnAxyVTBTLjn0W2TVhKU4/1SJR1JDKgcEi+CSigYLdUYi X-Gm-Gg: AfdE7cmiIZ2QJTeiBU0yAVghBn+3XIZp65Hcbm3HAhO3lFs1KMUWh8VSflwvGgiO7Iz fCjouDm1g089lwG12wfVzIZJ95ULi2+Teq4UWNmVuKntZ9alHJMijsZu9UYfelqntxb8z9Btxc4 vhouFDF7HJfC5uSOl7890MPtqCwG1EZldndN6uGDFMH48+wYxSJgGEyhARAmR0e5MNa/e/Cn20f Yl0Dr64WC4cZjK82CEjdiuPEZU5iwY0vfjFhoA1uQqVlOs+QsDVN83d5nraDTXJG3PVq+R4etR1 EoMFo8spNCwxRcr+gPwkvD1gs4mIsGvV8HODQTnM4HDEtaq/bbaKioSVcj1tTqn2+e4tHMy3gPY DjtnFcHYyNi8/4SwhNLOdDI8xatnp0+H8MrzIyTZekWxFli/RPuTS0Izb0ykpptAdE8ScC8jUBP WBlR54M/8fz4OMnetlI82xkuBVIEDwaIOcFFRyl2eJTUchfL3rDKP7bCeKrUfBClbVxZhY4UNnC 9L1hng6vz4= X-Received: by 2002:a05:7300:2146:b0:2f2:8857:17f6 with SMTP id 5a478bee46e88-30c84b6cffdmr13075690eec.4.1782630106728; Sun, 28 Jun 2026 00:01:46 -0700 (PDT) Received: from [192.168.1.45] ([45.64.226.42]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30c7c8b1ae5sm39878489eec.16.2026.06.28.00.01.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2026 00:01:46 -0700 (PDT) From: Prashant Rahul Date: Sun, 28 Jun 2026 12:31:24 +0530 Subject: [PATCH 1/4] staging: octeon: factor out device removal into a helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260628-staging-driver-octeon-panic-v1-1-fe8c34989254@gmail.com> References: <20260628-staging-driver-octeon-panic-v1-0-fe8c34989254@gmail.com> In-Reply-To: <20260628-staging-driver-octeon-panic-v1-0-fe8c34989254@gmail.com> To: Greg Kroah-Hartman Cc: Shuah Khan , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Prashant Rahul X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1736; i=prashantrahul23@gmail.com; h=from:subject:message-id; bh=qmJ1u5i7dUxtk1Om5Jtki/OJy4eDe0UdEmPjGhr7Ji8=; b=owEBbQKS/ZANAwAKAWw+kajX8DhtAcsmYgBqQMbUQGyiBhy/O7DvPhZ7aQqEeWGa2K4A93X0G aueYubFhUKJAjMEAAEKAB0WIQRS5esR6MP3hQs0SsxsPpGo1/A4bQUCakDG1AAKCRBsPpGo1/A4 bZKaEACm2/iBd89hxkJvqctf3TX5ZndR41qPKfUOkGwYXuORQiyblG5XsivjfH9gYq1OheymdyC wYzbuJZRQzzOqweKhvwquL+wpB+QGBxruVNyqMN5NxpCQVhosFnm/1ynTV4wnnY6rvMhi8VMKZr q+zJQs6cIlu8rKHkPg5Fst6gnAEfb2/5zYK73U/twb9yhy4HwIpQZjqgkA3bBbCa0SfmYkVrAX8 ujn1Z115R2fYhXpGhd6/jgxlJHxw2hwHReaTNhQEVLoKEb1tG4VMWj2EE7O4Xe2yzCn1sK0QJJ7 IvSeloBN6K1uO50l5TS4ZVeYNmqu8evRkc2w3rfIDmFkEjnILolnX+PptwQ6eMQydNzm2RY1XR/ +zE9++rkpPVQSOuNcV6V4TCtjd5c6hxGpCXNZxDM+PZgRuenolmaQ/FMAM2Sf89yJemwUk2OYf5 ITRU8xy+POsu1u+Txd+m2VHKCXxnzBSWhmf9gWpHn/dNom7cwiWb6lH/pTqiXqWRwih3spHhhFW iL6+TRxExrL9LvKggsXpuZlHiL3nZmQsjhBF5oe7mjcUNaR+OEEPGAkpwCWqfrWW0NcI4TZnR/m PRUx0TT7Mx4JJuyi76DMlo/3AUp3hXTJH1QieYa7ZDqxgUDWp85ySsR3e5HjeiLr8HAFA6vUde+ Pon1MXExXD4UDIA== X-Developer-Key: i=prashantrahul23@gmail.com; a=openpgp; fpr=52E5EB11E8C3F7850B344ACC6C3E91A8D7F0386D Factor out the common device removal sequence into a helper in preparation for adding cleanup to the probe error path. Signed-off-by: Prashant Rahul --- drivers/staging/octeon/ethernet.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index f3fa221f452e2..e07c6911b8252 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -104,6 +104,21 @@ struct net_device *cvm_oct_device[TOTAL_NUMBER_OF_PORTS]; u64 cvm_oct_tx_poll_interval; +static inline void cvm_oct_remove_device(int port) +{ + if (cvm_oct_device[port]) { + struct net_device *dev = cvm_oct_device[port]; + struct octeon_ethernet *priv = netdev_priv(dev); + + cancel_delayed_work_sync(&priv->port_periodic_work); + + cvm_oct_tx_shutdown_dev(dev); + unregister_netdev(dev); + free_netdev(dev); + cvm_oct_device[port] = NULL; + } +} + static void cvm_oct_rx_refill_worker(struct work_struct *work) { struct octeon_ethernet_platform *plat = container_of(work, @@ -949,17 +964,7 @@ static void cvm_oct_remove(struct platform_device *pdev) /* Free the ethernet devices */ for (port = 0; port < TOTAL_NUMBER_OF_PORTS; port++) { - if (cvm_oct_device[port]) { - struct net_device *dev = cvm_oct_device[port]; - struct octeon_ethernet *priv = netdev_priv(dev); - - cancel_delayed_work_sync(&priv->port_periodic_work); - - cvm_oct_tx_shutdown_dev(dev); - unregister_netdev(dev); - free_netdev(dev); - cvm_oct_device[port] = NULL; - } + cvm_oct_remove_device(port); } cvmx_pko_shutdown(); -- 2.54.0