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

Thu May 2 08:49:51 CEST 2024

Hi Tom,

Acked-by: Angelo Dureghello <angelo at kernel-space.org>

On 02/05/24 3:31 AM, Tom Rini 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: Stefan Roese <sr at denx.de>
> Cc: Tom Rini <trini at konsulko.com>
> Cc: Ryan Chen <ryan_chen at aspeedtech.com>
> Cc: Chia-Wei Wang <chiawei_wang at aspeedtech.com>
> Cc: Aspeed BMC SW team <BMC-SW at aspeedtech.com>
> Cc: Joel Stanley <joel at jms.id.au>
> Cc: Michal Simek <michal.simek at amd.com>
> Cc: Alex Nemirovsky <alex.nemirovsky at cortina-access.com>
> Cc: Huan Wang <alison.wang at nxp.com>
> Cc: Angelo Dureghello <angelo at kernel-space.org>
> Cc: Ryder Lee <ryder.lee at mediatek.com>
> Cc: Weijie Gao <weijie.gao at mediatek.com>
> Cc: Chunfeng Yun <chunfeng.yun at mediatek.com>
> Cc: GSS_MTK_Uboot_upstream <GSS_MTK_Uboot_upstream at mediatek.com>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Priyanka Jain <priyanka.jain at nxp.com>
> Cc: Michael Walle <michael at walle.cc>
> Cc: Patrick Delaunay <patrick.delaunay at foss.st.com>
> Cc: Patrice Chotard <patrice.chotard at foss.st.com>
> ---
>   drivers/watchdog/armada-37xx-wdt.c   | 1 -
>   drivers/watchdog/ast2600_wdt.c       | 1 -
>   drivers/watchdog/ast_wdt.c           | 1 -
>   drivers/watchdog/at91sam9_wdt.c      | 1 -
>   drivers/watchdog/bcm6345_wdt.c       | 1 -
>   drivers/watchdog/cdns_wdt.c          | 1 -
>   drivers/watchdog/cortina_wdt.c       | 1 -
>   drivers/watchdog/designware_wdt.c    | 1 -
>   drivers/watchdog/ftwdt010_wdt.c      | 1 -
>   drivers/watchdog/imx_watchdog.c      | 1 -
>   drivers/watchdog/mcf_wdt.c           | 2 +-
>   drivers/watchdog/mpc8xxx_wdt.c       | 1 -
>   drivers/watchdog/mt7621_wdt.c        | 1 -
>   drivers/watchdog/mtk_wdt.c           | 1 -
>   drivers/watchdog/omap_wdt.c          | 1 -
>   drivers/watchdog/orion_wdt.c         | 1 -
>   drivers/watchdog/rti_wdt.c           | 1 -
>   drivers/watchdog/s5p_wdt.c           | 1 -
>   drivers/watchdog/sandbox_alarm-wdt.c | 1 -
>   drivers/watchdog/sandbox_wdt.c       | 1 -
>   drivers/watchdog/sbsa_gwdt.c         | 1 -
>   drivers/watchdog/sl28cpld-wdt.c      | 1 -
>   drivers/watchdog/sp805_wdt.c         | 1 -
>   drivers/watchdog/stm32mp_wdt.c       | 1 -
>   drivers/watchdog/tangier_wdt.c       | 1 -
>   drivers/watchdog/ulp_wdog.c          | 1 -
>   drivers/watchdog/wdt-uclass.c        | 1 -
>   drivers/watchdog/xilinx_tb_wdt.c     | 1 -
>   drivers/watchdog/xilinx_wwdt.c       | 1 -
>   29 files changed, 1 insertion(+), 29 deletions(-)
>
> diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c
> index e09f5ac9e34e..4b51178e1b8c 100644
> --- a/drivers/watchdog/armada-37xx-wdt.c
> +++ b/drivers/watchdog/armada-37xx-wdt.c
> @@ -5,7 +5,6 @@
>    * Marek Behún <kabel at kernel.org>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <wdt.h>
>   #include <asm/global_data.h>
> diff --git a/drivers/watchdog/ast2600_wdt.c b/drivers/watchdog/ast2600_wdt.c
> index bc9842089bea..190490f3692b 100644
> --- a/drivers/watchdog/ast2600_wdt.c
> +++ b/drivers/watchdog/ast2600_wdt.c
> @@ -3,7 +3,6 @@
>    * Copyright (c) 2020 Aspeed Technology, Inc
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <log.h>
> diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
> index f7b5a1adc108..e61e13fdc49d 100644
> --- a/drivers/watchdog/ast_wdt.c
> +++ b/drivers/watchdog/ast_wdt.c
> @@ -3,7 +3,6 @@
>    * Copyright 2017 Google, Inc
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <errno.h>
>   #include <log.h>
> diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
> index 647ae325e9ae..c809a8936b89 100644
> --- a/drivers/watchdog/at91sam9_wdt.c
> +++ b/drivers/watchdog/at91sam9_wdt.c
> @@ -18,7 +18,6 @@
>   #include <asm/global_data.h>
>   #include <asm/io.h>
>   #include <asm/arch/at91_wdt.h>
> -#include <common.h>
>   #include <div64.h>
>   #include <dm.h>
>   #include <errno.h>
> diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c
> index 677b1347ca7a..6ebe901c2b82 100644
> --- a/drivers/watchdog/bcm6345_wdt.c
> +++ b/drivers/watchdog/bcm6345_wdt.c
> @@ -7,7 +7,6 @@
>    *	Copyright (C) 2008 Florian Fainelli <florian at openwrt.org>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <log.h>
>   #include <wdt.h>
> diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
> index 743ab6487bcd..cb5a786c5891 100644
> --- a/drivers/watchdog/cdns_wdt.c
> +++ b/drivers/watchdog/cdns_wdt.c
> @@ -6,7 +6,6 @@
>    * Author(s):	Shreenidhi Shedi <yesshedi at gmail.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <log.h>
>   #include <wdt.h>
> diff --git a/drivers/watchdog/cortina_wdt.c b/drivers/watchdog/cortina_wdt.c
> index 7ab9d7b2db97..9f09ac0e15ff 100644
> --- a/drivers/watchdog/cortina_wdt.c
> +++ b/drivers/watchdog/cortina_wdt.c
> @@ -4,7 +4,6 @@
>    *
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <hang.h>
>   #include <asm/io.h>
> diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c
> index b22e0ee06a4e..bd9d7105366b 100644
> --- a/drivers/watchdog/designware_wdt.c
> +++ b/drivers/watchdog/designware_wdt.c
> @@ -4,7 +4,6 @@
>    */
>   
>   #include <clk.h>
> -#include <common.h>
>   #include <dm.h>
>   #include <reset.h>
>   #include <wdt.h>
> diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c
> index 1f5f301b1251..4769b967e527 100644
> --- a/drivers/watchdog/ftwdt010_wdt.c
> +++ b/drivers/watchdog/ftwdt010_wdt.c
> @@ -14,7 +14,6 @@
>    * 22/08/2022 Port to DM
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <wdt.h>
>   #include <log.h>
> diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c
> index 894158b304a7..ea770217e590 100644
> --- a/drivers/watchdog/imx_watchdog.c
> +++ b/drivers/watchdog/imx_watchdog.c
> @@ -4,7 +4,6 @@
>    * Licensed under the GPL-2 or later.
>    */
>   
> -#include <common.h>
>   #include <cpu_func.h>
>   #include <dm.h>
>   #include <hang.h>
> diff --git a/drivers/watchdog/mcf_wdt.c b/drivers/watchdog/mcf_wdt.c
> index b36488bb5b96..5092a256af0c 100644
> --- a/drivers/watchdog/mcf_wdt.c
> +++ b/drivers/watchdog/mcf_wdt.c
> @@ -6,7 +6,7 @@
>    *
>    */
>   
> -#include <common.h>
> +#include <config.h>
>   #include <dm.h>
>   #include <hang.h>
>   #include <asm/io.h>
> diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
> index f28636ca9015..036ff690d3fd 100644
> --- a/drivers/watchdog/mpc8xxx_wdt.c
> +++ b/drivers/watchdog/mpc8xxx_wdt.c
> @@ -3,7 +3,6 @@
>    * Copyright 2017 CS Systemes d'Information
>    */
>   
> -#include <common.h>
>   #include <env.h>
>   #include <dm.h>
>   #include <wdt.h>
> diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c
> index f7d201b921a1..6308d9632a81 100644
> --- a/drivers/watchdog/mt7621_wdt.c
> +++ b/drivers/watchdog/mt7621_wdt.c
> @@ -9,7 +9,6 @@
>    *   Copyright (C) 2013 John Crispin <blogic at openwrt.org>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <wdt.h>
>   #include <asm/global_data.h>
> diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
> index 368b36849c8d..706deb9da846 100644
> --- a/drivers/watchdog/mtk_wdt.c
> +++ b/drivers/watchdog/mtk_wdt.c
> @@ -6,7 +6,6 @@
>    * Author: Ryder Lee <ryder.lee at mediatek.com>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <hang.h>
>   #include <wdt.h>
> diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
> index f0e57b4f7286..5fd02ddf564f 100644
> --- a/drivers/watchdog/omap_wdt.c
> +++ b/drivers/watchdog/omap_wdt.c
> @@ -36,7 +36,6 @@
>    *	Use the driver model and standard identifiers; handle bigger timeouts.
>    */
>   
> -#include <common.h>
>   #include <log.h>
>   #include <watchdog.h>
>   #include <asm/ti-common/omap_wdt.h>
> diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
> index 127766df58af..4562b2a37e34 100644
> --- a/drivers/watchdog/orion_wdt.c
> +++ b/drivers/watchdog/orion_wdt.c
> @@ -12,7 +12,6 @@
>    * warranty of any kind, whether express or implied.
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <clk.h>
>   #include <log.h>
> diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c
> index 8d93f19b984a..99168d0cad03 100644
> --- a/drivers/watchdog/rti_wdt.c
> +++ b/drivers/watchdog/rti_wdt.c
> @@ -8,7 +8,6 @@
>    * Derived from linux/drivers/watchdog/rti_wdt.c
>    */
>   
> -#include <common.h>
>   #include <clk.h>
>   #include <dm.h>
>   #include <dm/device_compat.h>
> diff --git a/drivers/watchdog/s5p_wdt.c b/drivers/watchdog/s5p_wdt.c
> index 80524a00101b..c244f15a8952 100644
> --- a/drivers/watchdog/s5p_wdt.c
> +++ b/drivers/watchdog/s5p_wdt.c
> @@ -4,7 +4,6 @@
>    * Minkyu Kang <mk7.kang at samsung.com>
>    */
>   
> -#include <common.h>
>   #include <asm/io.h>
>   #include <asm/arch/cpu.h>
>   #include <asm/arch/watchdog.h>
> diff --git a/drivers/watchdog/sandbox_alarm-wdt.c b/drivers/watchdog/sandbox_alarm-wdt.c
> index 71bb5d924ea5..8dbbfc249e7c 100644
> --- a/drivers/watchdog/sandbox_alarm-wdt.c
> +++ b/drivers/watchdog/sandbox_alarm-wdt.c
> @@ -1,4 +1,3 @@
> -#include <common.h>
>   #include <dm.h>
>   #include <os.h>
>   #include <wdt.h>
> diff --git a/drivers/watchdog/sandbox_wdt.c b/drivers/watchdog/sandbox_wdt.c
> index 535614f04d63..cd5eadbfd213 100644
> --- a/drivers/watchdog/sandbox_wdt.c
> +++ b/drivers/watchdog/sandbox_wdt.c
> @@ -3,7 +3,6 @@
>    * Copyright 2017 Google, Inc
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <wdt.h>
>   #include <asm/state.h>
> diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
> index 96d04665d52c..03585529bb63 100644
> --- a/drivers/watchdog/sbsa_gwdt.c
> +++ b/drivers/watchdog/sbsa_gwdt.c
> @@ -7,7 +7,6 @@
>   
>   #include <asm/global_data.h>
>   #include <asm/io.h>
> -#include <common.h>
>   #include <dm/device.h>
>   #include <dm/fdtaddr.h>
>   #include <dm/read.h>
> diff --git a/drivers/watchdog/sl28cpld-wdt.c b/drivers/watchdog/sl28cpld-wdt.c
> index af5a6b1a28ac..c5b4f8a9f665 100644
> --- a/drivers/watchdog/sl28cpld-wdt.c
> +++ b/drivers/watchdog/sl28cpld-wdt.c
> @@ -5,7 +5,6 @@
>    * Copyright (c) 2021 Michael Walle <michael at walle.cc>
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <wdt.h>
>   #include <sl28cpld.h>
> diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
> index 6d58fd3cfdab..10fe3e282323 100644
> --- a/drivers/watchdog/sp805_wdt.c
> +++ b/drivers/watchdog/sp805_wdt.c
> @@ -8,7 +8,6 @@
>   #include <log.h>
>   #include <asm/global_data.h>
>   #include <asm/io.h>
> -#include <common.h>
>   #include <clk.h>
>   #include <dm/device.h>
>   #include <dm/fdtaddr.h>
> diff --git a/drivers/watchdog/stm32mp_wdt.c b/drivers/watchdog/stm32mp_wdt.c
> index 7ebcd2552668..97ab8cfe7ab1 100644
> --- a/drivers/watchdog/stm32mp_wdt.c
> +++ b/drivers/watchdog/stm32mp_wdt.c
> @@ -5,7 +5,6 @@
>   
>   #define LOG_CATEGORY UCLASS_WDT
>   
> -#include <common.h>
>   #include <clk.h>
>   #include <dm.h>
>   #include <log.h>
> diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c
> index bdc65597dcff..8fbfac31b1e1 100644
> --- a/drivers/watchdog/tangier_wdt.c
> +++ b/drivers/watchdog/tangier_wdt.c
> @@ -2,7 +2,6 @@
>   /*
>    * Copyright (c) 2017 Intel Corporation
>    */
> -#include <common.h>
>   #include <dm.h>
>   #include <log.h>
>   #include <wdt.h>
> diff --git a/drivers/watchdog/ulp_wdog.c b/drivers/watchdog/ulp_wdog.c
> index 0eea04ed2c6e..83f19dc0e86b 100644
> --- a/drivers/watchdog/ulp_wdog.c
> +++ b/drivers/watchdog/ulp_wdog.c
> @@ -3,7 +3,6 @@
>    * Copyright (C) 2016 Freescale Semiconductor, Inc.
>    */
>   
> -#include <common.h>
>   #include <cpu_func.h>
>   #include <asm/io.h>
>   #include <asm/arch/imx-regs.h>
> diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c
> index 417e8d7eef95..c88312ec7218 100644
> --- a/drivers/watchdog/wdt-uclass.c
> +++ b/drivers/watchdog/wdt-uclass.c
> @@ -5,7 +5,6 @@
>   
>   #define LOG_CATEGORY UCLASS_WDT
>   
> -#include <common.h>
>   #include <cyclic.h>
>   #include <div64.h>
>   #include <dm.h>
> diff --git a/drivers/watchdog/xilinx_tb_wdt.c b/drivers/watchdog/xilinx_tb_wdt.c
> index b38c40001611..8a8e55370a0e 100644
> --- a/drivers/watchdog/xilinx_tb_wdt.c
> +++ b/drivers/watchdog/xilinx_tb_wdt.c
> @@ -8,7 +8,6 @@
>    * Copyright (c) 2011-2018 Xilinx Inc.
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <log.h>
>   #include <wdt.h>
> diff --git a/drivers/watchdog/xilinx_wwdt.c b/drivers/watchdog/xilinx_wwdt.c
> index 963ab22fb452..41eff1a46450 100644
> --- a/drivers/watchdog/xilinx_wwdt.c
> +++ b/drivers/watchdog/xilinx_wwdt.c
> @@ -9,7 +9,6 @@
>    */
>   
>   #include <clk.h>
> -#include <common.h>
>   #include <dm.h>
>   #include <regmap.h>
>   #include <wdt.h>