video: Convert CONFIG_VIDEO_LOGO to Kconfig

[platform/kernel/u-boot.git] / include / ahci.h

diff --git a/include/ahci.h b/include/ahci.h
index cc36d81..d545304 100644 (file)
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) Freescale Semiconductor, Inc. 2006.
  * Author: Jason Jin<Jason.jin@freescale.com>
  *         Zhang Wei<wei.zhang@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #ifndef _AHCI_H_
 #define _AHCI_H_
@@ -135,8 +134,6 @@ struct ahci_sg {
 };
 
 struct ahci_ioports {
-       void __iomem    *cmd_addr;
-       void __iomem    *scr_addr;
        void __iomem    *port_mmio;
        struct ahci_cmd_hdr     *cmd_slot;
        struct ahci_sg          *cmd_tbl_sg;
@@ -151,16 +148,12 @@ struct ahci_ioports {
  * where dev is the controller (although at present it sometimes stands alone).
  */
 struct ahci_uc_priv {
-#if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SCSI)
        /*
         * TODO(sjg@chromium.org): Drop this once this structure is only used
         * in a driver-model context (i.e. attached to a device with
         * dev_get_uclass_priv()
         */
        struct udevice *dev;
-#else
-       pci_dev_t       dev;
-#endif
        struct ahci_ioports     port[AHCI_MAX_PORTS];
        u16 *ataid[AHCI_MAX_PORTS];
        u32     n_ports;