From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 A01AB3D5676 for ; Mon, 29 Jun 2026 07:25:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782717930; cv=none; b=HnGAoMh49zvcKTVvek6LviDWMxRWbbhN0X1J+CAA2fzuVfOOiUvmU3HqD9xmebzDWazJFv4jCAm8BfvHAwtuAXn0xiSKPjio+U3Cud85ep/3jgKlhvjpwdfcnj9LrdGipeoGSN49CP5fWg5iyk5QL6oZZxJ2Who1Gl0dY/rup1E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782717930; c=relaxed/simple; bh=khgheVguVdeFE+wyUH5YXIcOZa6D01g5zyQMaHR1NvQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=eVLzT7ehq7fzjoJOPtHwtFrLZUqnGbqa/idNRvwvylZXkNsLeP3v9rnVyQo4uuQJXHQT3PCiD5e6PiaSSaRCoGV4HEQ7W3jIgUK45E/kdPMeim+S3Dr8vNYmQCJDsd6VmjzCQWahgo9CLqdxwpAbdR55SLsUdLK0rN1QRddNrDg= 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=Yu8fJXG0; arc=none smtp.client-ip=209.85.128.47 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="Yu8fJXG0" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-490cf3000f0so24657005e9.1 for ; Mon, 29 Jun 2026 00:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782717926; x=1783322726; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=7Ie4+XaFXJV+Jm6lzci9LsIOsL6cRLfhbTILzizGtUw=; b=Yu8fJXG0Q37pgp1tlY3HcTrTcS1DteQGq6t3IOEYtiEvDIwk19AgTaG6rXpWxRrIal 4ZEyYaMUI4rIReAsz65ErLOlnIYwcZp8jhH7AigUZiZ+D5FlvjztoS8JUpdwKxRpYP93 v2si9/PXQSBinTEdqC8VN7unm3q3KQLET9lcuAW5hCPQpcJ1794Ep1tH9A2HAqrV14Yx vRQdKFcSKwMyG70vCKscH/vufxEkkafbDFone4j6xeVFs3VOEOVsDJf5i+ac4GkU+i3Z 6aZVpGop1Ea4oXy+kNEHX8PHvvXZ/FlLhIRSn1qBUjG+MeqkfiwbI7Iyf5yd5gFxAqIW uwlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782717926; x=1783322726; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7Ie4+XaFXJV+Jm6lzci9LsIOsL6cRLfhbTILzizGtUw=; b=M8UvxnzeVsqVKI+7VZkJ6gToJybgfNkA2oWoZwWJgaI1337lul17i+oeqGYctXxd8d thbTRC65ohfp7knCpUpV63syQFkYxT+pPMmrKY/rH/KqjHj/9F7Vztf0CPej4G3T9eb1 h2Vf3fdYOXaLVIK17aqaHisXV0jxtX33JntFOEa8epJhoAvBBmK8i0ou394PWjIJVEhS a+qABTsISsYUIv+VfUppzuAwAarKQUrYqgRLBHz3t+r9GCc2eNhvzREN/8dSH7LWUTDe nwPNin8TtZhyzBObcvHotCiFHoI0djTlu52jhlMHqx9aEW6ACYKCiddOT3yQx1wPqAmI eV5g== X-Forwarded-Encrypted: i=1; AFNElJ/+oIW/GexqrpzuTWxX1KDUCBp71RblN2ZsBraB7GBE6wfQN4+7SnzNyd2HQwVCYhExP19RCOhX9XeDm1Q=@vger.kernel.org X-Gm-Message-State: AOJu0YzwEgIuzxLnpWakDq5XVl4jkwcDe9SAwcsEizPHaXevlvzisChh 7zsaDYPE/IRYNL/IttKE1gI235bDYH1eKwFelVWLagwxRCS/24i0wlBu X-Gm-Gg: AfdE7cnA+ppESRoo/uS9wO6YYZoLoOCfvJGzHNRjf4qpvav4pN5QQfIIbW+K2SvUejf +yizqxo+3CT1MCzqkL7ji6Mid05Ibz8nttr6HqIQeyCXsNvRseH3pcZULEBl2Vd/bItnvmpjuKY znSxXK6QwV2w0B7yZCctmP9T/chwqtUw7PwjZ3jEokS+D0QNwtW/ZuN7swuxVXWEGhpytQOfdkg IscHRqH+6WScChbq9KJTBdR3wS2woTJAYRcBibtGdIWD/6/gIRp60Zcy11i/+dcc535rklp2Hrh ldxswuTvP4Z+IIK5dc+IhHvEmLA+kbdwtD+A2NtxVEKb9N+HmG6/Y59Sm8FsnqbOdYU9Fwk8cJc QpoiYKRo6f8gjPLJLxI4zD06CmoKrM+2rnhQY3sTEMn+c4f6efz50/IeN0l3XEn8Ari5RSMk8Lz PBq60pcHARPw== X-Received: by 2002:a05:600c:4747:b0:493:8391:919a with SMTP id 5b1f17b1804b1-4938391942amr106268015e9.16.1782717925877; Mon, 29 Jun 2026 00:25:25 -0700 (PDT) Received: from localhost ([2c0f:3d00:6be:8900:9cf4:43df:e612:817b]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4926c285fc1sm198718815e9.1.2026.06.29.00.25.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 00:25:25 -0700 (PDT) Date: Mon, 29 Jun 2026 10:25:21 +0300 From: Dan Carpenter To: Prashant Rahul Cc: Greg Kroah-Hartman , Shuah Khan , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/4] staging: octeon: factor out device removal into a helper Message-ID: References: <20260628-staging-driver-octeon-panic-v1-0-fe8c34989254@gmail.com> <20260628-staging-driver-octeon-panic-v1-1-fe8c34989254@gmail.com> 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=us-ascii Content-Disposition: inline In-Reply-To: <20260628-staging-driver-octeon-panic-v1-1-fe8c34989254@gmail.com> On Sun, Jun 28, 2026 at 12:31:24PM +0530, Prashant Rahul wrote: > 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); > } Delete the curly braces as well. regards, dan carpenter