| Message ID | f7a7fab3ec5edf803d934fca04df22631c2b449d.1651662885.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d9ccf770c7c5e5e92ee2189fcddf39e348bb0028 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v3] sungem: Prepare cleanup of powerpc's asm/prom.h | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 4 May 2022 13:16:09 +0200 you wrote: > powerpc's <asm/prom.h> includes some headers that it doesn't > need itself. > > In order to clean powerpc's <asm/prom.h> up in a further step, > first clean all files that include <asm/prom.h> > > sungem_phy.c doesn't use any object provided by <asm/prom.h>. > > [...] Here is the summary with links: - [net-next,v3] sungem: Prepare cleanup of powerpc's asm/prom.h https://git.kernel.org/netdev/net-next/c/d9ccf770c7c5 You are awesome, thank you!
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index 4daac5fda073..ff22b6b1c686 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c @@ -29,11 +29,7 @@ #include <linux/mii.h> #include <linux/ethtool.h> #include <linux/delay.h> - -#ifdef CONFIG_PPC_PMAC -#include <asm/prom.h> -#endif - +#include <linux/of.h> #include <linux/sungem_phy.h> /* Link modes of the BCM5400 PHY */
powerpc's <asm/prom.h> includes some headers that it doesn't need itself. In order to clean powerpc's <asm/prom.h> up in a further step, first clean all files that include <asm/prom.h> sungem_phy.c doesn't use any object provided by <asm/prom.h>. But removing inclusion of <asm/prom.h> leads to the following errors: CC drivers/net/sungem_phy.o drivers/net/sungem_phy.c: In function 'bcm5421_init': drivers/net/sungem_phy.c:448:42: error: implicit declaration of function 'of_get_parent'; did you mean 'dget_parent'? [-Werror=implicit-function-declaration] 448 | struct device_node *np = of_get_parent(phy->platform_data); | ^~~~~~~~~~~~~ | dget_parent drivers/net/sungem_phy.c:448:42: warning: initialization of 'struct device_node *' from 'int' makes pointer from integer without a cast [-Wint-conversion] drivers/net/sungem_phy.c:450:35: error: implicit declaration of function 'of_get_property' [-Werror=implicit-function-declaration] 450 | if (np == NULL || of_get_property(np, "no-autolowpower", NULL)) | ^~~~~~~~~~~~~~~ Remove <asm/prom.h> from included headers but add <linux/of.h> to handle the above. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- v3: Make a more specific commit message v2: More detailed commit description --- drivers/net/sungem_phy.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)