Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03CDFC433F5 for ; Mon, 11 Apr 2022 17:58:19 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5454983E45; Mon, 11 Apr 2022 19:57:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1649699820; bh=mxaUBIIPtHwy32JUeobw7Kgpd21ia5WGbedHR3kOKzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=KGCSqkvZgGFu6gYoxcpz3i7jZrdlNrhbXbV/yCFuMHTgaLH7P8pkJnNJLmCFxYYCu URXs2qWL4bwqqQAq4tw0QJ8LzDkABzVC1i4LJC3iZ3HHYITdCLs5gPBRNOSGrKxsIt GG3Cf2Y1OfA5/uMf8+QtHdLxk3HJZnXlNHTRWdiX0PyLqXPjBNV0QNLYOFMrc3tVjy kyUQZYCpx52FRJRktRqQuaQHo9rqNwV4v6jnphKj3hQO/kcw8NacX9OGz7ExaFJT72 A3y17cPxGd1hzPUxiXwphIg91z2i7MXXfOi4u5AWnlAIn6S3kB/E/M4C3KFyXIZqM5 tH7CxgLvch88w== Received: from tr.lan (ip-86-49-12-201.net.upcbroadband.cz [86.49.12.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 3F3018394A; Mon, 11 Apr 2022 19:56:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1649699796; bh=mxaUBIIPtHwy32JUeobw7Kgpd21ia5WGbedHR3kOKzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j/0Pp2wexe2bexmgNiDrvPxl2aOdx3d95DllIaG7KG4gVe4IUecepubdjKnnDXqHy R7MI/PPGrq8FdqC397/b3WOGWGI5GQoHCEZMW/39yYPByWi1mhShE/OlWkDXtkkMjt TjUgCmMHPKRIKWoM4mZ0IT5KtIgI4FLkzkuH3E0CiyRnZL82thVl/a9QUUIkB3Y2Ib zEdIdhryBpdjpMpT+KwrEg9gf8uyZNLmk2MWUcuD9ptYUduTDz+atUb0z+Sk/Wc9DD TfmOIXq2KK9ZFYf0ON568szbZXHPpTiPQLCOhd5YAi9k/h6dQdykgRyWLMApa906zc 16JISe2zMfpkQ== From: Marek Vasut To: u-boot@lists.denx.de Cc: marcel.ziswiler@toradex.com, trini@konsulko.com, Marek Vasut , Joe Hershberger , Ramon Fried Subject: [PATCH 10/16] net: dm9000: Drop static device private data Date: Mon, 11 Apr 2022 19:56:01 +0200 Message-Id: <20220411175607.626034-10-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220411175607.626034-1-marex@denx.de> References: <20220411175607.626034-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Allocate driver private data dynamically in its init function and drop the static driver private data variable. Pass the dynamic private data throughout the driver. This is done in preparation for DM conversion. Signed-off-by: Marek Vasut Cc: Joe Hershberger Cc: Ramon Fried --- drivers/net/dm9000x.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 7e1368a1be9..666883ee19e 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -77,8 +77,6 @@ struct dm9000_priv { struct eth_device netdev; }; -static struct dm9000_priv dm9000_info; - /* DM9000 network board routine ---------------------------- */ #ifndef CONFIG_DM9000_BYTE_SWAPPED #define dm9000_outb(d, r) writeb((d), (r)) @@ -313,9 +311,9 @@ dm9000_reset(void) /* Initialize dm9000 board */ static int dm9000_init(struct eth_device *dev, struct bd_info *bd) { + struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev); int i, oft, lnk; u8 io_mode; - struct dm9000_priv *db = &dm9000_info; /* RESET device */ dm9000_reset(); @@ -430,10 +428,10 @@ static int dm9000_init(struct eth_device *dev, struct bd_info *bd) * Hardware start transmission. * Send a packet to media from the upper layer. */ -static int dm9000_send(struct eth_device *netdev, void *packet, int length) +static int dm9000_send(struct eth_device *dev, void *packet, int length) { + struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev); int tmo; - struct dm9000_priv *db = &dm9000_info; dm9000_dump_packet(__func__, packet, length); @@ -483,12 +481,12 @@ static void dm9000_halt(struct eth_device *netdev) /* * Received a packet and pass to upper layer */ -static int dm9000_rx(struct eth_device *netdev) +static int dm9000_rx(struct eth_device *dev) { + struct dm9000_priv *db = container_of(dev, struct dm9000_priv, dev); u8 rxbyte; u8 *rdptr = (u8 *)net_rx_packets[0]; u16 rxstatus, rxlen = 0; - struct dm9000_priv *db = &dm9000_info; /* * Check packet ready or not, we must check @@ -591,18 +589,22 @@ static void dm9000_get_enetaddr(struct eth_device *dev) {} int dm9000_initialize(struct bd_info *bis) { - struct eth_device *dev = &dm9000_info.netdev; + struct dm9000_priv *priv; + + priv = kcalloc(1, sizeof(*priv)); + if (!priv) + return -ENOMEM; /* Load MAC address from EEPROM */ - dm9000_get_enetaddr(dev); + dm9000_get_enetaddr(&priv->dev); dev->init = dm9000_init; dev->halt = dm9000_halt; dev->send = dm9000_send; dev->recv = dm9000_rx; - strcpy(dev->name, "dm9000"); + strcpy(&priv->dev.name, "dm9000"); - eth_register(dev); + eth_register(&priv->dev); return 0; } -- 2.35.1