mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: linux-kernel@vger.kernel.org
Cc: Amarula patchwork <linux-amarula@amarulasolutions.com>,
	michael@amarulasolutions.com,
	Dario Binacchi <dario.binacchi@amarulasolutions.com>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Marc Kleine-Budde <mkl@pengutronix.de>,
	Paolo Abeni <pabeni@redhat.com>,
	Wolfgang Grandegger <wg@grandegger.com>,
	linux-can@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH v2 05/13] can: slcan: simplify the device de-allocation
Date: Wed,  8 Jun 2022 18:51:08 +0200	[thread overview]
Message-ID: <20220608165116.1575390-6-dario.binacchi@amarulasolutions.com> (raw)
In-Reply-To: <20220608165116.1575390-1-dario.binacchi@amarulasolutions.com>

Since slcan_devs array contains the addresses of the created devices, I
think it is more natural to use its address to remove it from the list.
It is not necessary to store the index of the array that points to the
device in the driver's private data.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---

(no changes since v1)

 drivers/net/can/slcan.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 929cb55e08af..cf05c30b8da5 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -432,11 +432,17 @@ static int slc_open(struct net_device *dev)
 
 static void slc_dealloc(struct slcan *sl)
 {
-	int i = sl->dev->base_addr;
+	unsigned int i;
 
-	free_candev(sl->dev);
-	if (slcan_devs)
-		slcan_devs[i] = NULL;
+	for (i = 0; i < maxdev; i++) {
+		if (sl->dev == slcan_devs[i]) {
+			free_candev(sl->dev);
+			slcan_devs[i] = NULL;
+			return;
+		}
+	}
+
+	pr_err("slcan: can't free %s resources\n",  sl->dev->name);
 }
 
 static int slcan_change_mtu(struct net_device *dev, int new_mtu)
@@ -533,7 +539,6 @@ static struct slcan *slc_alloc(void)
 
 	snprintf(dev->name, sizeof(dev->name), "slcan%d", i);
 	dev->netdev_ops = &slc_netdev_ops;
-	dev->base_addr  = i;
 	sl = netdev_priv(dev);
 
 	/* Initialize channel control data */
-- 
2.32.0


  parent reply	other threads:[~2022-06-08 16:56 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-08 16:51 [PATCH v2 00/13] can: slcan: extend supported features Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 01/13] can: slcan: use the BIT() helper Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 02/13] can: slcan: use netdev helpers to print out messages Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 03/13] can: slcan: use the alloc_can_skb() helper Dario Binacchi
2022-06-09  8:07   ` Marc Kleine-Budde
2022-06-08 16:51 ` [PATCH v2 04/13] can: slcan: use CAN network device driver API Dario Binacchi
2022-06-08 16:51 ` Dario Binacchi [this message]
2022-06-08 20:38   ` [PATCH v2 05/13] can: slcan: simplify the device de-allocation Oliver Hartkopp
2022-06-11 10:46     ` Dario Binacchi
2022-06-12 16:23       ` Max Staudt
2022-06-12 17:13         ` Oliver Hartkopp
2022-06-12 21:20           ` Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 06/13] can: slcan: allow to send commands to the adapter Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 07/13] can: slcan: set bitrate by CAN device driver API Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 08/13] can: slcan: send the open command to the adapter Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 09/13] can: slcan: send the close " Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 10/13] can: slcan: move driver into separate sub directory Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 11/13] can: slcan: add ethtool support to reset adapter errors Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 12/13] can: slcan: extend the protocol with error info Dario Binacchi
2022-06-08 16:51 ` [PATCH v2 13/13] can: slcan: extend the protocol with CAN state info Dario Binacchi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220608165116.1575390-6-dario.binacchi@amarulasolutions.com \
    --to=dario.binacchi@amarulasolutions.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=linux-amarula@amarulasolutions.com \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael@amarulasolutions.com \
    --cc=mkl@pengutronix.de \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=wg@grandegger.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®