From 11795e02c142c536644a07825c8dbc4058ddfac3 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 14 Jul 2023 11:51:38 -0600 Subject: [PATCH 1/3] soc: microchip: Explicitly include correct DT includes The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Signed-off-by: Rob Herring Signed-off-by: Conor Dooley Link: https://lore.kernel.org/r/20230714175139.4067685-1-robh@kernel.org [claudiu.beznea: added link] Signed-off-by: Claudiu Beznea --- drivers/soc/atmel/sfr.c | 1 - drivers/soc/microchip/mpfs-sys-controller.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/soc/atmel/sfr.c b/drivers/soc/atmel/sfr.c index 0525eef49d1a..cc94ca1b494c 100644 --- a/drivers/soc/atmel/sfr.c +++ b/drivers/soc/atmel/sfr.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/drivers/soc/microchip/mpfs-sys-controller.c b/drivers/soc/microchip/mpfs-sys-controller.c index 216d9f4ea0ce..fbcd5fd24d7c 100644 --- a/drivers/soc/microchip/mpfs-sys-controller.c +++ b/drivers/soc/microchip/mpfs-sys-controller.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include From d4b564a524612ee8766a51128eca17e43b40d16e Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 17 Jul 2023 16:54:29 -0600 Subject: [PATCH 2/3] ARM: at91: Explicitly include correct DT includes The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it was merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. A couple of other includes are unused and can be dropped too. Signed-off-by: Rob Herring Link: https://lore.kernel.org/r/20230717225429.3211307-1-robh@kernel.org Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm.c | 1 + arch/arm/mach-at91/samv7.c | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 437dd0352fd4..1a26af0fabc7 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/mach-at91/samv7.c b/arch/arm/mach-at91/samv7.c index 28f998f0fba5..22d00005ec09 100644 --- a/arch/arm/mach-at91/samv7.c +++ b/arch/arm/mach-at91/samv7.c @@ -5,14 +5,7 @@ * Copyright (C) 2013 Atmel, * 2016 Andras Szemzo */ -#include -#include -#include -#include #include -#include -#include -#include "generic.h" static const char *const samv7_dt_board_compat[] __initconst = { "atmel,samv7", From 96a49448c4777940b16eecdfc61f935fa380d864 Mon Sep 17 00:00:00 2001 From: YueHaibing Date: Tue, 25 Jul 2023 22:11:05 +0800 Subject: [PATCH 3/3] ARM: at91: Remove unused extern declarations commit 157576d55233 ("misc: remove atmel_tclib") left behind this. Signed-off-by: YueHaibing Link: https://lore.kernel.org/r/20230725141105.26904-1-yuehaibing@huawei.com Signed-off-by: Claudiu Beznea --- include/soc/at91/atmel_tcb.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/soc/at91/atmel_tcb.h b/include/soc/at91/atmel_tcb.h index 1d7071dc0bca..26b56a07bd1f 100644 --- a/include/soc/at91/atmel_tcb.h +++ b/include/soc/at91/atmel_tcb.h @@ -77,9 +77,6 @@ struct atmel_tc { bool allocated; }; -extern struct atmel_tc *atmel_tc_alloc(unsigned block); -extern void atmel_tc_free(struct atmel_tc *tc); - /* platform-specific ATMEL_TC_TIMER_CLOCKx divisors (0 means 32KiHz) */ extern const u8 atmel_tc_divisors[5];