Skip to contentSkip to conversation

firmware: imx: Remove unused include of linux/firmware/imx/types.h

PATCH In review Anson Huang 3 participants 4 messages Apr 23, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/3 firmware: imx: Remove unused include of linux/firmware/imx/types.h

Now that linux/firmware/imx/types.h is removed, remove it from the include list in imx-scu.c driver.

---
 drivers/firmware/imx/imx-scu.c | 1 -
 1 file changed, 1 deletion(-)
drivers/firmware/imx/imx-scu.c +0 -1
index f71eaa5..f3340fa 100644
@@ -8,7 +8,6 @@
  */
 
 #include <linux/err.h>
-#include <linux/firmware/imx/types.h>
 #include <linux/firmware/imx/ipc.h>
 #include <linux/firmware/imx/sci.h>
 #include <linux/interrupt.h>
Signature · 1 line
2.7.4
#1 lore raw

PATCH 3/3 thermal: imx_sc: Include rsrc.h instead of types.h

The linux/firmware/imx/types.h has been merged into dt-bindings/firmware/imx/rsrc.h, change the includes in imx_sc_thermal.c driver accordingly.

---
 drivers/thermal/imx_sc_thermal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/imx_sc_thermal.c +1 -1
index b2b68c9..b01d28e 100644
@@ -3,9 +3,9 @@
  * Copyright 2018-2020 NXP.
  */
 
+#include <dt-bindings/firmware/imx/rsrc.h>
 #include <linux/err.h>
 #include <linux/firmware/imx/sci.h>
-#include <linux/firmware/imx/types.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
Signature · 1 line
2.7.4
#2 lore raw

Re: [PATCH 3/3] thermal: imx_sc: Include rsrc.h instead of types.h

Quoted 14 lines · Anson Huang

The linux/firmware/imx/types.h has been merged into dt-bindings/firmware/imx/rsrc.h, change the includes in imx_sc_thermal.c driver accordingly.

---
  drivers/thermal/imx_sc_thermal.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/imx_sc_thermal.c +0 -0
index b2b68c9..b01d28e 100644

drivers/thermal/imx_sc_thermal.c line 11

Quoted 10 lines
drivers/thermal/imx_sc_thermal.c +1 -1
@@ -3,9 +3,9 @@
   * Copyright 2018-2020 NXP.
   */
 
+#include <dt-bindings/firmware/imx/rsrc.h>
  #include <linux/err.h>
  #include <linux/firmware/imx/sci.h>
-#include <linux/firmware/imx/types.h>
  #include <linux/module.h>
  #include <linux/of.h>
  #include <linux/of_device.h>

You should do the operation of removing the header file and updating the *.c files in one single patch.

Otherwise, we will break bisection. There will be states of the linux kernel tree that do not compile.

#3 lore raw
In reply to Anson Huang
Quoted 7 lines

From: Anson Huang <[email protected]>
Sent: Thursday, April 23, 2020 10:00 PM

Now that linux/firmware/imx/types.h is removed, remove it from the include list in imx-scu.c driver.

You need combine them in order to not break bisect.

Regards
Aisheng

Quoted 18 lines
---
 drivers/firmware/imx/imx-scu.c | 1 -
 1 file changed, 1 deletion(-)
drivers/firmware/imx/imx-scu.c +0 -2
index f71eaa5..f3340fa 100644
@@ -8,7 +8,6 @@
  */
 
 #include <linux/err.h>
-#include <linux/firmware/imx/types.h>
 #include <linux/firmware/imx/ipc.h>
 #include <linux/firmware/imx/sci.h>
 #include <linux/interrupt.h>
--

2.7.4