Skip to contentSkip to conversation

firmware: arm_scmi: remove duplicate include header

PATCH Applied [email protected] 4 participants 5 messages Feb 10, 2023 – Mar 9, 2023 System control & power/management interface (SCPI/SCMI) Message Protocol drivers

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 firmware: arm_scmi: remove duplicate include header

From: Ye Xingchen <[email protected]>

linux/of.h is included more than once.

Signed-off-by Ye Xingchen <[email protected]>
---
 drivers/firmware/arm_scmi/bus.c | 1 -
 1 file changed, 1 deletion(-)
drivers/firmware/arm_scmi/bus.c +0 -1
index 73140b854b31..b2d242178fbc 100644
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/device.h>
-#include <linux/of.h>
 
 #include "common.h"
Signature · 1 line
2.25.1
reviewer
#1 lore raw
Quoted 14 lines · On Fri, Feb 10, 2023 at 03:20:07PM +0800, [email protected] wrote:

From: Ye Xingchen <[email protected]>

linux/of.h is included more than once.

Signed-off-by Ye Xingchen <[email protected]>
---
 drivers/firmware/arm_scmi/bus.c | 1 -
 1 file changed, 1 deletion(-)
drivers/firmware/arm_scmi/bus.c +0 -0
index 73140b854b31..b2d242178fbc 100644

drivers/firmware/arm_scmi/bus.c line 17

Quoted 5 lines
drivers/firmware/arm_scmi/bus.c +0 -1
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/device.h>
-#include <linux/of.h>

Hi Ye,

thanks for this.

Looking at next-20230210 it seem like the linux/of.h include that you removed was added by:

commit 96da4a99ce507bb98e2ba77018a2f91999c8c12b

Author: Saravana Kannan <[email protected]>
Date:   Mon Feb 6 17:42:03 2023 -0800

firmware: arm_scmi: Set fwnode for the scmi_device

...AND indeed there was already a linux/of.h include added by a preceding commit by myself

commit d3cd7c525fd2ecce3a6c963f314969a54783d211

Author: Cristian Marussi <[email protected]>
Date:   Thu Dec 22 18:50:45 2022 +0000

firmware: arm_scmi: Refactor protocol device creation

...BUT they both hit next- together so the clash.

My series is queued for the next merge window on soc/, not sure about the state of Saravana series, but if that series will be queued too for v6.3 we'll need to pick up your fix indeed, Ye.

Probably better to wait and pick it up in v6.3-rc1 once the situation will be more clear as what is going in.

Up to Sudeep anyway the choice.

Thanks,
Cristian

#2 lore raw
Quoted 42 lines · Cristian Marussi
Quoted 14 lines · On Fri, Feb 10, 2023 at 03:20:07PM +0800, [email protected] wrote:

From: Ye Xingchen <[email protected]>

linux/of.h is included more than once.

Signed-off-by Ye Xingchen <[email protected]>
---
 drivers/firmware/arm_scmi/bus.c | 1 -
 1 file changed, 1 deletion(-)
drivers/firmware/arm_scmi/bus.c +0 -0
index 73140b854b31..b2d242178fbc 100644

drivers/firmware/arm_scmi/bus.c line 17

Quoted 5 lines
drivers/firmware/arm_scmi/bus.c +0 -1
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/device.h>
-#include <linux/of.h>

Hi Ye,

thanks for this.

Looking at next-20230210 it seem like the linux/of.h include that you removed was added by:

commit 96da4a99ce507bb98e2ba77018a2f91999c8c12b

Author: Saravana Kannan <[email protected]>
Date:   Mon Feb 6 17:42:03 2023 -0800

firmware: arm_scmi: Set fwnode for the scmi_device

...AND indeed there was already a linux/of.h include added by a preceding commit by myself

commit d3cd7c525fd2ecce3a6c963f314969a54783d211

Author: Cristian Marussi <[email protected]>
Date:   Thu Dec 22 18:50:45 2022 +0000
Quoted 7 lines

firmware: arm_scmi: Refactor protocol device creation

...BUT they both hit next- together so the clash.

My series is queued for the next merge window on soc/, not sure about the state of Saravana series, but if that series will be queued too for v6.3 we'll need to pick up your fix indeed, Ye.

AFAIU, my series is queued up for 6.3.

-Saravana

#3 lore raw
In reply to Cristian Marussi
Quoted 45 lines · Cristian Marussi
Quoted 14 lines · On Fri, Feb 10, 2023 at 03:20:07PM +0800, [email protected] wrote:

From: Ye Xingchen <[email protected]>

linux/of.h is included more than once.

Signed-off-by Ye Xingchen <[email protected]>
---
 drivers/firmware/arm_scmi/bus.c | 1 -
 1 file changed, 1 deletion(-)
drivers/firmware/arm_scmi/bus.c +0 -0
index 73140b854b31..b2d242178fbc 100644

drivers/firmware/arm_scmi/bus.c line 17

Quoted 5 lines
drivers/firmware/arm_scmi/bus.c +0 -1
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/device.h>
-#include <linux/of.h>

Hi Ye,

thanks for this.

Looking at next-20230210 it seem like the linux/of.h include that you removed was added by:

commit 96da4a99ce507bb98e2ba77018a2f91999c8c12b

Author: Saravana Kannan <[email protected]>
Date:   Mon Feb 6 17:42:03 2023 -0800

firmware: arm_scmi: Set fwnode for the scmi_device

...AND indeed there was already a linux/of.h include added by a preceding commit by myself

commit d3cd7c525fd2ecce3a6c963f314969a54783d211

Author: Cristian Marussi <[email protected]>
Date:   Thu Dec 22 18:50:45 2022 +0000

firmware: arm_scmi: Refactor protocol device creation

...BUT they both hit next- together so the clash.

Quoted 9 lines

My series is queued for the next merge window on soc/, not sure about the state of Saravana series, but if that series will be queued too for v6.3 we'll need to pick up your fix indeed, Ye.

Probably better to wait and pick it up in v6.3-rc1 once the situation will be more clear as what is going in.

Up to Sudeep anyway the choice.

Yes I will pick this up once we have the issue(i.e. both the above commit) in the main upstream branch.

Signature · 2 lines
Regards,
Sudeep