2020-04-23 14:23:55

by Anson Huang

Subject: [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.

Signed-off-by: Anson Huang <[email protected]>
---
drivers/thermal/imx_sc_thermal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/imx_sc_thermal.c b/drivers/thermal/imx_sc_thermal.c
index b2b68c9..b01d28e 100644
--- a/drivers/thermal/imx_sc_thermal.c
+++ b/drivers/thermal/imx_sc_thermal.c
@@ -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>
--
2.7.4

2020-04-23 19:59:32

by Daniel Baluta

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

On 4/23/20 4:59 PM, Anson Huang wrote:
> 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.
>
> Signed-off-by: Anson Huang <[email protected]>
> ---
> drivers/thermal/imx_sc_thermal.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/imx_sc_thermal.c b/drivers/thermal/imx_sc_thermal.c
> index b2b68c9..b01d28e 100644
> --- a/drivers/thermal/imx_sc_thermal.c
> +++ b/drivers/thermal/imx_sc_thermal.c
> @@ -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.