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 X-Spam-Level: X-Spam-Status: No, score=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9999C4338F for ; Mon, 26 Jul 2021 13:38:45 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 769D860F02 for ; Mon, 26 Jul 2021 13:38:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 769D860F02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 470AC83374; Mon, 26 Jul 2021 15:38:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="eccD1YGN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3EAE283333; Mon, 26 Jul 2021 15:37:02 +0200 (CEST) Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) (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 3FC7983331 for ; Mon, 26 Jul 2021 15:35:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-ot1-x32f.google.com with SMTP id 68-20020a9d0f4a0000b02904b1f1d7c5f4so8985655ott.9 for ; Mon, 26 Jul 2021 06:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ij4vKW5yf6E7VcDyNsY8YqtE3FkbLP3do9Mhlvpc+so=; b=eccD1YGNWVgEAPbRwJM4BcZYCA72KcHFt11b0XahqdvHYLpsJo19oSe+q3X1WHToRW LwbwLQdE4yZ/Dyw2EhIXmXeZfm2mF5+TOhxnKNjjyf1KK22OW7YC1bqyOnnX7/qkkjl1 Han8/CCEdgR71YCYMh4fhDkIzcRvvmP4apCqE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ij4vKW5yf6E7VcDyNsY8YqtE3FkbLP3do9Mhlvpc+so=; b=nl9lP0ENeMAZ1h0soC3GgiWk72UlFlZISCKa/v9TYFFZTqDjBGhjqhZIYoQEGh3bxQ 0OmQ4WxSs67JIOVcH2X6XyodrZlzL2uwT4J34vdLQAAK/tsQv28tl3L0WxPBqNC4DmsP U1SCGLWJ//p9H7zE5fx32RNtaYjBzg1bqShqnWEkJ1hJAjLLO8FrVMz9/Kb67OlW3LSB 4uslVRtGN8kyk1Ti1KrEpSrAwSfATVKrjEqub8NwvMffhADm1WGfV9HksfCEjVxm/y4Z ZNsp3ExWHXFwe4CE14GEBS1LrSLiLHjYC5cRJ1Pz6iFDTXKPVwTgkDmxImx+gpSPLQET NBqg== X-Gm-Message-State: AOAM533IzvYTVODQBctEf1juLuLjGtddN3wOmmsbVtXu1Hmd3He3PC4B WT09prRfdbppq+LkiX0G4uPiEcyjRMbm6J+Z X-Google-Smtp-Source: ABdhPJxOVNTV5PdMmkjIi63T01czuC8iL1GntEszM7OYgWaAfqO3T/7F6a53DYRBDrctu+qi18hd8A== X-Received: by 2002:a9d:7f14:: with SMTP id j20mr11213457otq.82.1627306518461; Mon, 26 Jul 2021 06:35:18 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id t141sm6591527oot.40.2021.07.26.06.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:35:18 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Joe Hershberger Subject: [PATCH 22/33] net: Drop DM_PCI check from designware driver Date: Mon, 26 Jul 2021 07:34:28 -0600 Message-Id: <20210726133440.634682-23-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog In-Reply-To: <20210726133440.634682-1-sjg@chromium.org> References: <20210726133440.634682-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean We don't need this check anymore since when PCI is enabled, driver model is always used. Drop it. Signed-off-by: Simon Glass --- drivers/net/designware.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 5d92257e74d..5aaac603a0e 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -756,16 +756,16 @@ int designware_eth_write_hwaddr(struct udevice *dev) static int designware_eth_bind(struct udevice *dev) { -#ifdef CONFIG_DM_PCI - static int num_cards; - char name[20]; - - /* Create a unique device name for PCI type devices */ - if (device_is_on_pci_bus(dev)) { - sprintf(name, "eth_designware#%u", num_cards++); - device_set_name(dev, name); + if (IS_ENABLED(CONFIG_PCI)) { + static int num_cards; + char name[20]; + + /* Create a unique device name for PCI type devices */ + if (device_is_on_pci_bus(dev)) { + sprintf(name, "eth_designware#%u", num_cards++); + device_set_name(dev, name); + } } -#endif return 0; } @@ -831,12 +831,11 @@ int designware_eth_probe(struct udevice *dev) else reset_deassert_bulk(&reset_bulk); -#ifdef CONFIG_DM_PCI /* * If we are on PCI bus, either directly attached to a PCI root port, * or via a PCI bridge, fill in plat before we probe the hardware. */ - if (device_is_on_pci_bus(dev)) { + if (IS_ENABLED(CONFIG_PCI) && device_is_on_pci_bus(dev)) { dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &iobase); iobase &= PCI_BASE_ADDRESS_MEM_MASK; iobase = dm_pci_mem_to_phys(dev, iobase); @@ -844,7 +843,6 @@ int designware_eth_probe(struct udevice *dev) pdata->iobase = iobase; pdata->phy_interface = PHY_INTERFACE_MODE_RMII; } -#endif debug("%s, iobase=%x, priv=%p\n", __func__, iobase, priv); ioaddr = iobase; -- 2.32.0.432.gabb21c7263-goog