| Message ID | E1cYdxc-0000XC-N6@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Russell King <rmk+kernel@armlinux.org.uk> writes: > Fix these errors reported by the 0-day builder by replacing the > linux/export.h include with linux/module.h. > > In file included from include/linux/platform_device.h:14:0, > from drivers/net/wireless/ath/ath5k/ahb.c:20: > include/linux/device.h:1463:1: warning: data definition has no type or storage class > module_init(__driver##_init); \ > ^ > include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' > module_driver(__platform_driver, platform_driver_register, \ > ^~~~~~~~~~~~~ > drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' > module_platform_driver(ath_ahb_driver); > ^~~~~~~~~~~~~~~~~~~~~~ > include/linux/device.h:1463:1: error: type defaults to 'int' in declaration of 'module_init' [-Werror=implicit-int] > module_init(__driver##_init); \ > ^ > include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' > module_driver(__platform_driver, platform_driver_register, \ > ^~~~~~~~~~~~~ > drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' > module_platform_driver(ath_ahb_driver); > ^~~~~~~~~~~~~~~~~~~~~~ > drivers/net/wireless/ath/ath5k/ahb.c:233:1: warning: parameter names (without types) in function declaration > In file included from include/linux/platform_device.h:14:0, > from drivers/net/wireless/ath/ath5k/ahb.c:20: > include/linux/device.h:1468:1: warning: data definition has no type or storage class > module_exit(__driver##_exit); > ^ > include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' > module_driver(__platform_driver, platform_driver_register, \ > ^~~~~~~~~~~~~ > drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' > module_platform_driver(ath_ahb_driver); > ^~~~~~~~~~~~~~~~~~~~~~ > include/linux/device.h:1468:1: error: type defaults to 'int' in declaration of 'module_exit' [-Werror=implicit-int] > module_exit(__driver##_exit); > ^ > include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' > module_driver(__platform_driver, platform_driver_register, \ > ^~~~~~~~~~~~~ > drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' > module_platform_driver(ath_ahb_driver); > ^~~~~~~~~~~~~~~~~~~~~~ > drivers/net/wireless/ath/ath5k/ahb.c:233:1: warning: parameter names (without types) in function declaration > In file included from include/linux/platform_device.h:14:0, > from drivers/net/wireless/ath/ath5k/ahb.c:20: > drivers/net/wireless/ath/ath5k/ahb.c:233:24: warning: 'ath_ahb_driver_exit' defined but not used [-Wunused-function] > module_platform_driver(ath_ahb_driver); > ^ > include/linux/device.h:1464:20: note: in definition of macro 'module_driver' > static void __exit __driver##_exit(void) \ > ^~~~~~~~ > drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' > module_platform_driver(ath_ahb_driver); > ^~~~~~~~~~~~~~~~~~~~~~ > drivers/net/wireless/ath/ath5k/ahb.c:233:24: warning: 'ath_ahb_driver_init' defined but not used [-Wunused-function] > module_platform_driver(ath_ahb_driver); > ^ > include/linux/device.h:1459:19: note: in definition of macro 'module_driver' > static int __init __driver##_init(void) \ > ^~~~~~~~ > drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' > module_platform_driver(ath_ahb_driver); > ^~~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Looks good to me: Acked-by: Kalle Valo <kvalo@codeaurora.org> I assume Dave will take this so I'll drop the patch from my queue.
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c index 2ca88b593e4c..c0794f5988b3 100644 --- a/drivers/net/wireless/ath/ath5k/ahb.c +++ b/drivers/net/wireless/ath/ath5k/ahb.c @@ -16,10 +16,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <linux/module.h> #include <linux/nl80211.h> #include <linux/platform_device.h> #include <linux/etherdevice.h> -#include <linux/export.h> #include <ath25_platform.h> #include "ath5k.h" #include "debug.h"
Fix these errors reported by the 0-day builder by replacing the linux/export.h include with linux/module.h. In file included from include/linux/platform_device.h:14:0, from drivers/net/wireless/ath/ath5k/ahb.c:20: include/linux/device.h:1463:1: warning: data definition has no type or storage class module_init(__driver##_init); \ ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^~~~~~~~~~~~~ drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(ath_ahb_driver); ^~~~~~~~~~~~~~~~~~~~~~ include/linux/device.h:1463:1: error: type defaults to 'int' in declaration of 'module_init' [-Werror=implicit-int] module_init(__driver##_init); \ ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^~~~~~~~~~~~~ drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(ath_ahb_driver); ^~~~~~~~~~~~~~~~~~~~~~ drivers/net/wireless/ath/ath5k/ahb.c:233:1: warning: parameter names (without types) in function declaration In file included from include/linux/platform_device.h:14:0, from drivers/net/wireless/ath/ath5k/ahb.c:20: include/linux/device.h:1468:1: warning: data definition has no type or storage class module_exit(__driver##_exit); ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^~~~~~~~~~~~~ drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(ath_ahb_driver); ^~~~~~~~~~~~~~~~~~~~~~ include/linux/device.h:1468:1: error: type defaults to 'int' in declaration of 'module_exit' [-Werror=implicit-int] module_exit(__driver##_exit); ^ include/linux/platform_device.h:228:2: note: in expansion of macro 'module_driver' module_driver(__platform_driver, platform_driver_register, \ ^~~~~~~~~~~~~ drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(ath_ahb_driver); ^~~~~~~~~~~~~~~~~~~~~~ drivers/net/wireless/ath/ath5k/ahb.c:233:1: warning: parameter names (without types) in function declaration In file included from include/linux/platform_device.h:14:0, from drivers/net/wireless/ath/ath5k/ahb.c:20: drivers/net/wireless/ath/ath5k/ahb.c:233:24: warning: 'ath_ahb_driver_exit' defined but not used [-Wunused-function] module_platform_driver(ath_ahb_driver); ^ include/linux/device.h:1464:20: note: in definition of macro 'module_driver' static void __exit __driver##_exit(void) \ ^~~~~~~~ drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(ath_ahb_driver); ^~~~~~~~~~~~~~~~~~~~~~ drivers/net/wireless/ath/ath5k/ahb.c:233:24: warning: 'ath_ahb_driver_init' defined but not used [-Wunused-function] module_platform_driver(ath_ahb_driver); ^ include/linux/device.h:1459:19: note: in definition of macro 'module_driver' static int __init __driver##_init(void) \ ^~~~~~~~ drivers/net/wireless/ath/ath5k/ahb.c:233:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(ath_ahb_driver); ^~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/net/wireless/ath/ath5k/ahb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)