]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
pci: sata_sil: Drop DM_PCI checks
authorSimon Glass <sjg@chromium.org>
Mon, 2 Aug 2021 00:54:37 +0000 (18:54 -0600)
committerTom Rini <trini@konsulko.com>
Fri, 6 Aug 2021 12:21:03 +0000 (08:21 -0400)
We don't need these checks anymore since when PCI is enabled, driver model
is always used.

Drop them.

Signed-off-by: Simon Glass <sjg@chromium.org>
drivers/ata/sata_sil.c
drivers/ata/sata_sil.h

index 7e4e97d803ed4bf5b79fe936b4051c91b0ed37e3..dda712f42cb2a514ebcc58361ebb3335d8b0830b 100644 (file)
 
 #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;
index a300c0c38875f0812f8aa65077b397333cdcf934..bea4322c919d3f6f7bc7aae5a66a790110fa5664 100644 (file)
@@ -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;