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.4 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 0E927C4338F for ; Mon, 2 Aug 2021 01:08:13 +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 626AA60D07 for ; Mon, 2 Aug 2021 01:08:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 626AA60D07 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 A41A68334F; Mon, 2 Aug 2021 03:07:51 +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="kUbR/H04"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A329A83340; Mon, 2 Aug 2021 03:05:39 +0200 (CEST) Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) (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 7304D8334B for ; Mon, 2 Aug 2021 02:55:12 +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-oi1-x230.google.com with SMTP id o20so22151721oiw.12 for ; Sun, 01 Aug 2021 17:55:12 -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=WXqiPoUDkqlBia7Syjogi+NS0n7j72l3cED4ggKy+l8=; b=kUbR/H04m4m04eWz/ehLiqL5wdTKYVJlTZy/XKNNgcRMP+c5lAu3TRSGAzupKicvNy +7XPORz1KD7EM4w0xp+sxAo7mzFRmmGaSLRojW1a+7W1MJ7Xg2mmLyy41A6tnOLDu36z /SLOuWThNjy6oyth+V4u9bOLxDdVsxK071QPI= 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=WXqiPoUDkqlBia7Syjogi+NS0n7j72l3cED4ggKy+l8=; b=a0b3ab6mn3+oVqgIZg3bYPK+uMzwy1j/ZNjtweDgvyavnb45cTHVXpGzojF8IO488v tbliS2XZKrnclElT0YAx7dLxuzxkWgA1e9WihLxTeKE/Omniniqfn5xsV8R77NV7hf9q wzaWPaEhaZx3pmRzSgHKxG8LEEHVoe8+/pUU54pIt08y+30jBzuAiy666Hmf2IP2xhyg wvzs8p0/sGFADUMv7hK9YR0/88BoIfc/xdaK6Rr5fESieZU9K2KxCA+Yr7rzjp+OAjLM jJN0neKaSmnEaEF+K3zaq0lYvTsN9SIr70M99bGeVq22GNR9a+90OmWpCqosmgZtArcF nJTg== X-Gm-Message-State: AOAM530SMng2qn9dspuYldelotZXpeflKCaSOuakY5q9fG1QW9MOYW3g d/OLB2qfHv2mQ7QjVtXUxGn8iQLGH4PPTkip X-Google-Smtp-Source: ABdhPJwWU0dcpuqv224dNock5rN5wl7q118zpC7K/e8NQ+0EptfYuKi9agkw5B4UIn1PxRM4YhyIPA== X-Received: by 2002:a05:6808:bd2:: with SMTP id o18mr9023428oik.20.1627865711001; Sun, 01 Aug 2021 17:55:11 -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 s2sm1452616ooc.15.2021.08.01.17.55.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 17:55:10 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 24/32] pci: sata_sil: Drop DM_PCI checks Date: Sun, 1 Aug 2021 18:54:37 -0600 Message-Id: <20210802005446.2267075-25-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.554.ge1b32706d8-goog In-Reply-To: <20210802005446.2267075-1-sjg@chromium.org> References: <20210802005446.2267075-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 these checks anymore since when PCI is enabled, driver model is always used. Drop them. Signed-off-by: Simon Glass --- (no changes since v1) drivers/ata/sata_sil.c | 8 -------- drivers/ata/sata_sil.h | 4 ---- 2 files changed, 12 deletions(-) diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index 7e4e97d803e..dda712f42cb 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -27,11 +27,7 @@ #include "sata_sil.h" -#ifdef CONFIG_DM_PCI #define virt_to_bus(devno, v) dm_pci_virt_to_mem(devno, (void *) (v)) -#else -#define virt_to_bus(devno, v) pci_virt_to_mem(devno, (void *) (v)) -#endif /* just compatible ahci_ops */ struct sil_ops { @@ -616,11 +612,7 @@ static int sil_init_sata(struct udevice *uc_dev, int dev) #else priv->sil_sata_desc[dev] = sata; priv->port_num = dev; -#ifdef CONFIG_DM_PCI sata->devno = uc_dev->parent; -#else - sata->devno = sata_info.devno; -#endif /* CONFIG_DM_PCI */ #endif sata->id = dev; sata->port = port; diff --git a/drivers/ata/sata_sil.h b/drivers/ata/sata_sil.h index a300c0c3887..bea4322c919 100644 --- a/drivers/ata/sata_sil.h +++ b/drivers/ata/sata_sil.h @@ -21,11 +21,7 @@ struct sil_sata { u16 pio; u16 mwdma; u16 udma; -#ifdef CONFIG_DM_PCI struct udevice *devno; -#else - pci_dev_t devno; -#endif int wcache; int flush; int flush_ext; -- 2.32.0.554.ge1b32706d8-goog