[PATCH 11/81] ata: Remove <common.h> and add needed includes

[Tony Dinh]

On Wed, May 1, 2024 at 6:31 PM Tom Rini <trini at konsulko.com> wrote:
>
> Remove <common.h> from this driver directory and when needed
> add missing include files directly.
>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
> Cc: Tom Rini <trini at konsulko.com>
> Cc: Stefan Roese <sr at denx.de>
> Cc: Samuel Holland <samuel at sholland.org>
> Cc: Sam Edwards <CFSworks at gmail.com>
> Cc: Andre Przywara <andre.przywara at arm.com>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Jonas Karlman <jonas at kwiboo.se>
> Cc: Johan Jonker <jbx6244 at gmail.com>
> Cc: Bin Meng <bmeng at tinylab.org>
> Cc: Tony Dinh <mibodhi at gmail.com>
> Cc: Michal Simek <michal.simek at amd.com>

Reviewed-by: Tony Dinh <mibodhi at gmail.com>

> ---
>  drivers/ata/ahci-pci.c     | 1 -
>  drivers/ata/ahci-uclass.c  | 1 -
>  drivers/ata/ahci.c         | 2 +-
>  drivers/ata/ahci_mvebu.c   | 1 -
>  drivers/ata/ahci_sunxi.c   | 1 -
>  drivers/ata/dwc_ahci.c     | 1 -
>  drivers/ata/dwc_ahsata.c   | 1 -
>  drivers/ata/fsl_sata.c     | 1 -
>  drivers/ata/libata.c       | 2 +-
>  drivers/ata/mtk_ahci.c     | 1 -
>  drivers/ata/sata.c         | 1 -
>  drivers/ata/sata_bootdev.c | 1 -
>  drivers/ata/sata_ceva.c    | 1 -
>  drivers/ata/sata_mv.c      | 2 +-
>  drivers/ata/sata_sil.c     | 1 -
>  15 files changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/ata/ahci-pci.c b/drivers/ata/ahci-pci.c
> index 5356b9d83d34..f2102aaa6353 100644
> --- a/drivers/ata/ahci-pci.c
> +++ b/drivers/ata/ahci-pci.c
> @@ -3,7 +3,6 @@
>   * Copyright (C) 2017, Bin Meng <bmeng.cn at gmail.com>
>   */
>
> -#include <common.h>
>  #include <ahci.h>
>  #include <scsi.h>
>  #include <dm.h>
> diff --git a/drivers/ata/ahci-uclass.c b/drivers/ata/ahci-uclass.c
> index d398b50b9a1e..7affb3f1ec79 100644
> --- a/drivers/ata/ahci-uclass.c
> +++ b/drivers/ata/ahci-uclass.c
> @@ -6,7 +6,6 @@
>
>  #define LOG_CATEGORY UCLASS_AHCI
>
> -#include <common.h>
>  #include <ahci.h>
>  #include <dm.h>
>
> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
> index 04ddc3394648..ac869296d525 100644
> --- a/drivers/ata/ahci.c
> +++ b/drivers/ata/ahci.c
> @@ -8,10 +8,10 @@
>   *
>   * This driver provides a SCSI interface to SATA.
>   */
> -#include <common.h>
>  #include <blk.h>
>  #include <cpu_func.h>
>  #include <log.h>
> +#include <time.h>
>  #include <linux/bitops.h>
>  #include <linux/delay.h>
>
> diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
> index f05150d61ddf..f6e2d6bee45b 100644
> --- a/drivers/ata/ahci_mvebu.c
> +++ b/drivers/ata/ahci_mvebu.c
> @@ -3,7 +3,6 @@
>   * Copyright (C) 2016 Stefan Roese <sr at denx.de>
>   */
>
> -#include <common.h>
>  #include <ahci.h>
>  #include <dm.h>
>  #include <log.h>
> diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
> index 9064774e6614..6cf5cee055e7 100644
> --- a/drivers/ata/ahci_sunxi.c
> +++ b/drivers/ata/ahci_sunxi.c
> @@ -1,4 +1,3 @@
> -#include <common.h>
>  #include <ahci.h>
>  #include <dm.h>
>  #include <log.h>
> diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c
> index 15fd3e365b2b..b480cde4465b 100644
> --- a/drivers/ata/dwc_ahci.c
> +++ b/drivers/ata/dwc_ahci.c
> @@ -8,7 +8,6 @@
>   * Author: Mugunthan V N <mugunthanvnm at ti.com>
>   */
>
> -#include <common.h>
>  #include <dm.h>
>  #include <ahci.h>
>  #include <scsi.h>
> diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
> index b4d4e39c9b3b..a29d641343ed 100644
> --- a/drivers/ata/dwc_ahsata.c
> +++ b/drivers/ata/dwc_ahsata.c
> @@ -4,7 +4,6 @@
>   * Terry Lv <r65388 at freescale.com>
>   */
>
> -#include <common.h>
>  #include <ahci.h>
>  #include <blk.h>
>  #include <cpu_func.h>
> diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
> index 969bc191f8e8..4990148388b6 100644
> --- a/drivers/ata/fsl_sata.c
> +++ b/drivers/ata/fsl_sata.c
> @@ -5,7 +5,6 @@
>   * Author: Dave Liu <daveliu at freescale.com>
>   */
>
> -#include <common.h>
>  #include <ahci.h>
>  #include <blk.h>
>  #include <command.h>
> diff --git a/drivers/ata/libata.c b/drivers/ata/libata.c
> index 47e2c5c1cc40..ef659cb1728a 100644
> --- a/drivers/ata/libata.c
> +++ b/drivers/ata/libata.c
> @@ -5,9 +5,9 @@
>   *             port from the libata of linux kernel
>   */
>
> -#include <common.h>
>  #include <compiler.h>
>  #include <libata.h>
> +#include <stdio.h>
>
>  u64 ata_id_n_sectors(u16 *id)
>  {
> diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c
> index 2c5227df306b..53aabee0a5e6 100644
> --- a/drivers/ata/mtk_ahci.c
> +++ b/drivers/ata/mtk_ahci.c
> @@ -8,7 +8,6 @@
>   * Author: Frank Wunderlich <frank-w at public-files.de>
>   */
>
> -#include <common.h>
>  #include <ahci.h>
>  #include <asm/global_data.h>
>  #include <asm/io.h>
> diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
> index 784d9bbeacb4..84437d3d346b 100644
> --- a/drivers/ata/sata.c
> +++ b/drivers/ata/sata.c
> @@ -9,7 +9,6 @@
>   *             Dave Liu <daveliu at freescale.com>
>   */
>
> -#include <common.h>
>  #include <ahci.h>
>  #include <blk.h>
>  #include <dm.h>
> diff --git a/drivers/ata/sata_bootdev.c b/drivers/ata/sata_bootdev.c
> index f638493ce04f..a5ca6f6fd5bb 100644
> --- a/drivers/ata/sata_bootdev.c
> +++ b/drivers/ata/sata_bootdev.c
> @@ -5,7 +5,6 @@
>   * Copyright 2023 Tony Dinh <mibodhi at gmail.com>
>   */
>
> -#include <common.h>
>  #include <ahci.h>
>  #include <bootdev.h>
>  #include <dm.h>
> diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c
> index 7769d4f99efd..a81b3165992a 100644
> --- a/drivers/ata/sata_ceva.c
> +++ b/drivers/ata/sata_ceva.c
> @@ -3,7 +3,6 @@
>   * (C) Copyright 2015 - 2016 Xilinx, Inc.
>   * Michal Simek <michal.simek at amd.com>
>   */
> -#include <common.h>
>  #include <dm.h>
>  #include <ahci.h>
>  #include <generic-phy.h>
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index 94d7369351a3..ac78760a33eb 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -31,7 +31,6 @@
>   * No port multiplier support
>   */
>
> -#include <common.h>
>  #include <ahci.h>
>  #include <blk.h>
>  #include <bootdev.h>
> @@ -46,6 +45,7 @@
>  #include <libata.h>
>  #include <malloc.h>
>  #include <sata.h>
> +#include <time.h>
>  #include <linux/bitops.h>
>  #include <linux/delay.h>
>  #include <linux/errno.h>
> diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
> index 43a91a79120a..5b80f6249d76 100644
> --- a/drivers/ata/sata_sil.c
> +++ b/drivers/ata/sata_sil.c
> @@ -5,7 +5,6 @@
>   * Author: Tang Yuantian <b29983 at freescale.com>
>   */
>
> -#include <common.h>
>  #include <blk.h>
>  #include <cpu_func.h>
>  #include <dm.h>
> --
> 2.34.1
>