2020-02-03 19:11:52

by Stephen Boyd

Subject: [PATCH] platform/chrome: wilco_ec: Include asm/unaligned instead of linux/ path

It seems that we shouldn't try to include the include/linux/ path to
unaligned functions. Just include asm/unaligned.h instead so that we
don't run into compilation warnings like below.

In file included from drivers/platform/chrome/wilco_ec/properties.c:8:0:
include/linux/unaligned/le_memmove.h:7:19: error: redefinition of 'get_unaligned_le16'
static inline u16 get_unaligned_le16(const void *p)
^~~~~~~~~~~~~~~~~~
In file included from arch/ia64/include/asm/unaligned.h:5:0,
from arch/ia64/include/asm/io.h:23,
from arch/ia64/include/asm/smp.h:21,
from include/linux/smp.h:68,
from include/linux/percpu.h:7,
from include/linux/arch_topology.h:9,
from include/linux/topology.h:30,
from include/linux/gfp.h:9,
from include/linux/xarray.h:14,
from include/linux/radix-tree.h:18,
from include/linux/idr.h:15,
from include/linux/kernfs.h:13,
from include/linux/sysfs.h:16,
from include/linux/kobject.h:20,
from include/linux/device.h:16,
from include/linux/platform_data/wilco-ec.h:11,
from drivers/platform/chrome/wilco_ec/properties.c:6:
include/linux/unaligned/le_struct.h:7:19: note: previous definition of 'get_unaligned_le16' was here
static inline u16 get_unaligned_le16(const void *p)
^~~~~~~~~~~~~~~~~~
Reported-by: kbuild test robot <[email protected]>
Fixes: 60fb8a8e93ca ("platform/chrome: wilco_ec: Allow wilco to be compiled in COMPILE_TEST")
Signed-off-by: Stephen Boyd <[email protected]>
---
drivers/platform/chrome/wilco_ec/properties.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/chrome/wilco_ec/properties.c b/drivers/platform/chrome/wilco_ec/properties.c
index e69682c95ea2..62f27610dd33 100644
--- a/drivers/platform/chrome/wilco_ec/properties.c
+++ b/drivers/platform/chrome/wilco_ec/properties.c
@@ -5,7 +5,7 @@

#include <linux/platform_data/wilco-ec.h>
#include <linux/string.h>
-#include <linux/unaligned/le_memmove.h>
+#include <asm/unaligned.h>

/* Operation code; what the EC should do with the property */
enum ec_property_op {
--
Sent by a computer, using git, on the internet

2020-02-11 09:43:10

by Enric Balletbo i Serra

Subject: Re: [PATCH] platform/chrome: wilco_ec: Include asm/unaligned instead of linux/ path

Hi Stephen,

On 3/2/20 18:46, Stephen Boyd wrote:
> It seems that we shouldn't try to include the include/linux/ path to
> unaligned functions. Just include asm/unaligned.h instead so that we
> don't run into compilation warnings like below.
>
> In file included from drivers/platform/chrome/wilco_ec/properties.c:8:0:
> include/linux/unaligned/le_memmove.h:7:19: error: redefinition of 'get_unaligned_le16'
> static inline u16 get_unaligned_le16(const void *p)
> ^~~~~~~~~~~~~~~~~~
> In file included from arch/ia64/include/asm/unaligned.h:5:0,
> from arch/ia64/include/asm/io.h:23,
> from arch/ia64/include/asm/smp.h:21,
> from include/linux/smp.h:68,
> from include/linux/percpu.h:7,
> from include/linux/arch_topology.h:9,
> from include/linux/topology.h:30,
> from include/linux/gfp.h:9,
> from include/linux/xarray.h:14,
> from include/linux/radix-tree.h:18,
> from include/linux/idr.h:15,
> from include/linux/kernfs.h:13,
> from include/linux/sysfs.h:16,
> from include/linux/kobject.h:20,
> from include/linux/device.h:16,
> from include/linux/platform_data/wilco-ec.h:11,
> from drivers/platform/chrome/wilco_ec/properties.c:6:
> include/linux/unaligned/le_struct.h:7:19: note: previous definition of 'get_unaligned_le16' was here
> static inline u16 get_unaligned_le16(const void *p)
> ^~~~~~~~~~~~~~~~~~
> Reported-by: kbuild test robot <[email protected]>
> Fixes: 60fb8a8e93ca ("platform/chrome: wilco_ec: Allow wilco to be compiled in COMPILE_TEST")
> Signed-off-by: Stephen Boyd <[email protected]>
> ---

Queued as a fix for 5.6. Thanks,

Enric