From c3dc39a2f85b16bf590789f7e283cd72275cd168 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:55 -0600 Subject: arm: Don't include common.h in header files It is bad practice to include common.h in other header files since it can bring in any number of superfluous definitions. It implies that some C files don't include it and thus may be missing CONFIG options that are set up by that file. The C files should include these themselves. Update some header files in arch/arm to drop this. Signed-off-by: Simon Glass --- drivers/usb/eth/lan7x.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'drivers/usb/eth') diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h index 7af610be37..35965e9645 100644 --- a/drivers/usb/eth/lan7x.h +++ b/drivers/usb/eth/lan7x.h @@ -4,7 +4,10 @@ */ #include +#include #include +#include +#include /* USB Vendor Requests */ #define USB_VENDOR_REQUEST_WRITE_REGISTER 0xA0 @@ -122,6 +125,10 @@ int lan7x_write_reg(struct usb_device *udev, u32 index, u32 data); int lan7x_read_reg(struct usb_device *udev, u32 index, u32 *data); +/* + * FIXME: Code should not be in header files. Nive this to a file common to + * the two drivers. + */ static inline int lan7x_wait_for_bit(struct usb_device *udev, const char *prefix, const u32 reg, const u32 mask, const bool set, -- cgit From 90526e9fbac47af16d70f323feae45d8d1b0f9b7 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:39:56 -0600 Subject: common: Drop net.h from common header Move this header out of the common header. Network support is used in quite a few places but it still does not warrant blanket inclusion. Note that this net.h header itself has quite a lot in it. It could be split into the driver-mode support, functions, structures, checksumming, etc. Signed-off-by: Simon Glass --- drivers/usb/eth/asix.c | 1 + drivers/usb/eth/lan78xx.c | 1 + drivers/usb/eth/lan7x.c | 1 + drivers/usb/eth/mcs7830.c | 1 + drivers/usb/eth/r8152.c | 1 + drivers/usb/eth/smsc95xx.c | 1 + drivers/usb/eth/usb_ether.c | 2 ++ 7 files changed, 8 insertions(+) (limited to 'drivers/usb/eth') diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index 3a8ec0bf2d..448f5245d1 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c index e8ee6650bc..fe8cc6acc5 100644 --- a/drivers/usb/eth/lan78xx.c +++ b/drivers/usb/eth/lan78xx.c @@ -4,6 +4,7 @@ */ #include +#include #include #include "usb_ether.h" #include "lan7x.h" diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c index 21786e1bdf..afe78d44a3 100644 --- a/drivers/usb/eth/lan7x.c +++ b/drivers/usb/eth/lan7x.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c index 75c45ee0ae..a9e0aabc61 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c index e5f73e3d4c..8dae5097b8 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index 25f69a061b..ab6411f561 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c index 3aca9ac265..d76e2ff5bb 100644 --- a/drivers/usb/eth/usb_ether.c +++ b/drivers/usb/eth/usb_ether.c @@ -7,7 +7,9 @@ #include #include #include +#include #include +#include #include #include "usb_ether.h" -- cgit From f7ae49fc4f363a803dab3be078e93ead8e75a8e9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:05 -0600 Subject: common: Drop log.h from common header Move this header out of the common header. Signed-off-by: Simon Glass --- drivers/usb/eth/asix.c | 1 + drivers/usb/eth/asix88179.c | 1 + drivers/usb/eth/lan75xx.c | 1 + drivers/usb/eth/lan78xx.c | 1 + drivers/usb/eth/lan7x.c | 1 + drivers/usb/eth/mcs7830.c | 1 + drivers/usb/eth/r8152.c | 1 + drivers/usb/eth/smsc95xx.c | 1 + drivers/usb/eth/usb_ether.c | 1 + 9 files changed, 9 insertions(+) (limited to 'drivers/usb/eth') diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index 448f5245d1..5f56f6f2dd 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index 00706bea86..b4a56390b3 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c index 418139d43a..94c6522a41 100644 --- a/drivers/usb/eth/lan75xx.c +++ b/drivers/usb/eth/lan75xx.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include "usb_ether.h" diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c index fe8cc6acc5..1d1b64ef3e 100644 --- a/drivers/usb/eth/lan78xx.c +++ b/drivers/usb/eth/lan78xx.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include "usb_ether.h" diff --git a/drivers/usb/eth/lan7x.c b/drivers/usb/eth/lan7x.c index afe78d44a3..0a283619ae 100644 --- a/drivers/usb/eth/lan7x.c +++ b/drivers/usb/eth/lan7x.c @@ -4,6 +4,7 @@ */ #include +#include #include #include #include diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c index a9e0aabc61..b8fe65237d 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c index 8dae5097b8..1454d98d8f 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index ab6411f561..82fea742b0 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c index d76e2ff5bb..e368ecda0d 100644 --- a/drivers/usb/eth/usb_ether.c +++ b/drivers/usb/eth/usb_ether.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include -- cgit From c05ed00afb95fa5237f16962fccf5810437317bf Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:11 -0600 Subject: common: Drop linux/delay.h from common header Move this uncommon header out of the common header. Signed-off-by: Simon Glass --- drivers/usb/eth/asix.c | 1 + drivers/usb/eth/asix88179.c | 1 + drivers/usb/eth/mcs7830.c | 1 + drivers/usb/eth/r8152.c | 1 + drivers/usb/eth/r8152_fw.c | 1 + drivers/usb/eth/smsc95xx.c | 1 + 6 files changed, 6 insertions(+) (limited to 'drivers/usb/eth') diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index 5f56f6f2dd..db75ae2498 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include "usb_ether.h" diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index b4a56390b3..381bef2bed 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include "usb_ether.h" #include diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c index b8fe65237d..0cb7dbc8fb 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c index 1454d98d8f..61b8683230 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include "usb_ether.h" diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c index 4bf4066d7a..d564de285f 100644 --- a/drivers/usb/eth/r8152_fw.c +++ b/drivers/usb/eth/r8152_fw.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "usb_ether.h" #include "r8152.h" diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index 82fea742b0..d3532df141 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "usb_ether.h" -- cgit From cd93d625fd751d55c729c78b10f82109d56a5f1d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:13 -0600 Subject: common: Drop linux/bitops.h from common header Move this uncommon header out of the common header. Signed-off-by: Simon Glass --- drivers/usb/eth/lan75xx.c | 1 + drivers/usb/eth/lan78xx.c | 1 + drivers/usb/eth/lan7x.h | 1 + drivers/usb/eth/r8152.h | 1 + drivers/usb/eth/r8152_fw.c | 1 + 5 files changed, 5 insertions(+) (limited to 'drivers/usb/eth') diff --git a/drivers/usb/eth/lan75xx.c b/drivers/usb/eth/lan75xx.c index 94c6522a41..46b92e8d68 100644 --- a/drivers/usb/eth/lan75xx.c +++ b/drivers/usb/eth/lan75xx.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "usb_ether.h" #include "lan7x.h" diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c index 1d1b64ef3e..e34ad2603f 100644 --- a/drivers/usb/eth/lan78xx.c +++ b/drivers/usb/eth/lan78xx.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "usb_ether.h" #include "lan7x.h" diff --git a/drivers/usb/eth/lan7x.h b/drivers/usb/eth/lan7x.h index 35965e9645..f71e8c7268 100644 --- a/drivers/usb/eth/lan7x.h +++ b/drivers/usb/eth/lan7x.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include diff --git a/drivers/usb/eth/r8152.h b/drivers/usb/eth/r8152.h index b6df535a83..09f1c6178b 100644 --- a/drivers/usb/eth/r8152.h +++ b/drivers/usb/eth/r8152.h @@ -7,6 +7,7 @@ #ifndef _RTL8152_ETH_H #define _RTL8152_ETH_H +#include #define R8152_BASE_NAME "r8152" #define PLA_IDR 0xc000 diff --git a/drivers/usb/eth/r8152_fw.c b/drivers/usb/eth/r8152_fw.c index d564de285f..3ebbd533cc 100644 --- a/drivers/usb/eth/r8152_fw.c +++ b/drivers/usb/eth/r8152_fw.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "usb_ether.h" #include "r8152.h" -- cgit