From mboxrd@z Thu Jan 1 00:00:00 1970 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 91867C43217 for ; Sun, 27 Nov 2022 15:28:49 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93EBD8519C; Sun, 27 Nov 2022 16:26:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="p1F6nqTt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 17E4A84F66; Sun, 27 Nov 2022 16:26:01 +0100 (CET) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EBC6E84508 for ; Sun, 27 Nov 2022 16:25:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-ej1-x62f.google.com with SMTP id td2so6242879ejc.5 for ; Sun, 27 Nov 2022 07:25:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SBATV7+1Cf9wozpllbRzvRHhutuuGPY0MSofwIsaAZs=; b=p1F6nqTtjzmOwD29nEHmic0Pjy6jfAEkkE0gv89lJX1op1FO0cc0oUZ3lpfSwzsaRh 17M4Fm7x2EinH1tBwXQ80c5P1z1jVftbM4xrmhcRMMNiLxb69tLBbmo7JyP8i8PJB2bX +cfTxeCdqiKcWTPbUn7RWvQohZIqEYQkBU7XQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SBATV7+1Cf9wozpllbRzvRHhutuuGPY0MSofwIsaAZs=; b=Yz6KtTze1GXGT87EKsHC2QVUUfbItEx1B5Yx/JnEHrHOCDfV25n2lfXpq8XN7uz7Tk one/iXeJDgFEo/ZQYW7MfELxE2N3hM3RUfPmSRAAU2eOw6RYA8v02dgLuGM1ApMmfqIG Q37s104m7YiO5Z9eAdzyWqL3abjzt4TLrnkZKCGCb/hL7OYUyGlkZjTFu35sfaOrxuJf x/axTQ2hG+MGo59AsIMwqUK03EfpVFEwX23usPGvq0rvRddlL0V0ltIpXD7DrW2kx4dY jAfMoX9XJs60WJXX6sHgSIQOfEHS9mMUwXjLLUWX6mP3OMMxijvWIWgzxksidzE0qbGo 6UZg== X-Gm-Message-State: ANoB5pkgudVnLwxxuJwAcvy2ZhZ6DZ4ltuEbeTRR2t/AoGkF1RPg3YmN M+J1Hl5ZHwxbwFMRFtRDRnVPv73GtbE6NQ== X-Google-Smtp-Source: AA0mqf4YFx8o0e8iaMRczvLOuor9/8vj9db+xmTNQBKnvM+aldjbHjvsurPWqBmDvHXDCpZhfsfk8Q== X-Received: by 2002:a17:906:9e20:b0:7af:206:9327 with SMTP id fp32-20020a1709069e2000b007af02069327mr40345826ejc.154.1669562758463; Sun, 27 Nov 2022 07:25:58 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-dc2c-1c0a-ea3e-04dc.res6.spectrum.com. [2603:6081:7b00:6400:dc2c:1c0a:ea3e:4dc]) by smtp.gmail.com with ESMTPSA id tb6-20020a1709078b8600b007b47749838asm3853036ejc.45.2022.11.27.07.25.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Nov 2022 07:25:58 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 18/41] net: fsl-mc: Remove non-DM_ETH code Date: Sun, 27 Nov 2022 10:25:13 -0500 Message-Id: <20221127152536.1556469-18-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221127152536.1556469-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221127152536.1556469-1-trini@konsulko.com> 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.6 at phobos.denx.de X-Virus-Status: Clean As DM_ETH is required for all network drivers, it's now safe to remove the non-DM_ETH support code. Signed-off-by: Tom Rini --- drivers/net/fsl-mc/mc.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 69da465eaabc..6b36860187ca 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -165,21 +165,12 @@ enum mc_fixup_type { }; static int mc_fixup_mac_addr(void *blob, int nodeoffset, -#ifdef CONFIG_DM_ETH const char *propname, struct udevice *eth_dev, -#else - const char *propname, struct eth_device *eth_dev, -#endif enum mc_fixup_type type) { -#ifdef CONFIG_DM_ETH struct eth_pdata *plat = dev_get_plat(eth_dev); unsigned char *enetaddr = plat->enetaddr; int eth_index = dev_seq(eth_dev); -#else - unsigned char *enetaddr = eth_dev->enetaddr; - int eth_index = eth_dev->index; -#endif int err = 0, len = 0, size, i; unsigned char env_enetaddr[ARP_HLEN]; unsigned int enetaddr_32[ARP_HLEN]; @@ -252,11 +243,7 @@ const char *dpl_get_connection_endpoint(void *blob, char *endpoint) } static int mc_fixup_dpl_mac_addr(void *blob, int dpmac_id, -#ifdef CONFIG_DM_ETH struct udevice *eth_dev) -#else - struct eth_device *eth_dev) -#endif { int objoff = fdt_path_offset(blob, "/objects"); int dpmacoff = -1, dpnioff = -1; @@ -355,11 +342,7 @@ void fdt_fsl_mc_fixup_iommu_map_entry(void *blob) } static int mc_fixup_dpc_mac_addr(void *blob, int dpmac_id, -#ifdef CONFIG_DM_ETH struct udevice *eth_dev) -#else - struct eth_device *eth_dev) -#endif { int nodeoffset = fdt_path_offset(blob, "/board_info/ports"), noff; int err = 0; @@ -402,12 +385,8 @@ static int mc_fixup_dpc_mac_addr(void *blob, int dpmac_id, static int mc_fixup_mac_addrs(void *blob, enum mc_fixup_type type) { int i, err = 0, ret = 0; -#ifdef CONFIG_DM_ETH #define ETH_NAME_LEN 20 struct udevice *eth_dev; -#else - struct eth_device *eth_dev; -#endif char ethname[ETH_NAME_LEN]; for (i = WRIOP1_DPMAC1; i < NUM_WRIOP_PORTS; i++) { -- 2.25.1