[PATCH v2 0/1] thermal: ti-soc-thermal: Remove duplicated header file inclusion

[PATCH v2 0/1] thermal: ti-soc-thermal: Remove duplicated header file inclusion

[Zhen Lei]

v1 --> v2:
Arrange all included header files in alphabetical order.


Zhen Lei (1):
  thermal: ti-soc-thermal: Remove duplicated header file inclusion

 drivers/thermal/ti-soc-thermal/ti-bandgap.c | 35 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 18 deletions(-)

-- 
1.8.3

[PATCH v2 1/1] thermal: ti-soc-thermal: Remove duplicated header file inclusion

[Zhen Lei]

Delete one of the header files <linux/of_device.h> that are included
twice, all included header files are then rearranged alphabetically.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
 drivers/thermal/ti-soc-thermal/ti-bandgap.c | 35 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index 8a3646e26ddd208..5e7e80b4a8171c4 100644
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
@@ -9,30 +9,29 @@
  *   Eduardo Valentin <eduardo.valentin@ti.com>
  */
 
-#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/cpu_pm.h>
+#include <linux/device.h>
+#include <linux/err.h>
 #include <linux/export.h>
+#include <linux/gpio/consumer.h>
 #include <linux/init.h>
-#include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/clk.h>
-#include <linux/gpio/consumer.h>
-#include <linux/platform_device.h>
-#include <linux/err.h>
-#include <linux/types.h>
-#include <linux/spinlock.h>
-#include <linux/sys_soc.h>
-#include <linux/reboot.h>
-#include <linux/of_device.h>
-#include <linux/of_platform.h>
-#include <linux/of_irq.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/cpu_pm.h>
-#include <linux/device.h>
-#include <linux/pm_runtime.h>
-#include <linux/pm.h>
-#include <linux/of.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/pm.h>
+#include <linux/pm_runtime.h>
+#include <linux/reboot.h>
+#include <linux/spinlock.h>
+#include <linux/sys_soc.h>
+#include <linux/types.h>
 
 #include "ti-bandgap.h"
 
-- 
1.8.3

Re: [PATCH v2 1/1] thermal: ti-soc-thermal: Remove duplicated header file inclusion

[J, KEERTHY]

On 4/6/2021 2:49 PM, Zhen Lei wrote:
> Delete one of the header files <linux/of_device.h> that are included
> twice, all included header files are then rearranged alphabetically.

Reviewed-by: Keerthy <j-keerthy@ti.com>

> 
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> ---
>   drivers/thermal/ti-soc-thermal/ti-bandgap.c | 35 ++++++++++++++---------------
>   1 file changed, 17 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> index 8a3646e26ddd208..5e7e80b4a8171c4 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> @@ -9,30 +9,29 @@
>    *   Eduardo Valentin <eduardo.valentin@ti.com>
>    */
>   
> -#include <linux/module.h>
> +#include <linux/clk.h>
> +#include <linux/cpu_pm.h>
> +#include <linux/device.h>
> +#include <linux/err.h>
>   #include <linux/export.h>
> +#include <linux/gpio/consumer.h>
>   #include <linux/init.h>
> -#include <linux/kernel.h>
>   #include <linux/interrupt.h>
> -#include <linux/clk.h>
> -#include <linux/gpio/consumer.h>
> -#include <linux/platform_device.h>
> -#include <linux/err.h>
> -#include <linux/types.h>
> -#include <linux/spinlock.h>
> -#include <linux/sys_soc.h>
> -#include <linux/reboot.h>
> -#include <linux/of_device.h>
> -#include <linux/of_platform.h>
> -#include <linux/of_irq.h>
>   #include <linux/io.h>
>   #include <linux/iopoll.h>
> -#include <linux/cpu_pm.h>
> -#include <linux/device.h>
> -#include <linux/pm_runtime.h>
> -#include <linux/pm.h>
> -#include <linux/of.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
>   #include <linux/of_device.h>
> +#include <linux/of.h>
> +#include <linux/of_irq.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/reboot.h>
> +#include <linux/spinlock.h>
> +#include <linux/sys_soc.h>
> +#include <linux/types.h>
>   
>   #include "ti-bandgap.h"
>   
> 

Re: [PATCH v2 1/1] thermal: ti-soc-thermal: Remove duplicated header file inclusion

[Daniel Lezcano]

On 06/04/2021 11:19, Zhen Lei wrote:
> Delete one of the header files <linux/of_device.h> that are included
> twice, all included header files are then rearranged alphabetically.

The duplicate header file inclusion has been already fixed in a previous
patch.

Applied this patch by massaging the changelog accordingly and fixing the
conflict.

Thanks

  -- Daniel

-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[thermal: thermal/next] thermal/drivers/ti-soc-thermal/ti-bandgap: Rearrange all the included header files alphabetically

[thermal-bot for Zhen Lei]

The following commit has been merged into the thermal/next branch of thermal:

Commit-ID:     5a4a8235fee69b5a31cf1c56a9fa14b0d21a930c
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//5a4a8235fee69b5a31cf1c56a9fa14b0d21a930c
Author:        Zhen Lei <thunder.leizhen@huawei.com>
AuthorDate:    Tue, 06 Apr 2021 17:19:12 +08:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Tue, 20 Apr 2021 19:02:16 +02:00

thermal/drivers/ti-soc-thermal/ti-bandgap: Rearrange all the included header files alphabetically

For the sake of lisibility, reorder the header files alphabetically.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210406091912.2583-2-thunder.leizhen@huawei.com
---
 drivers/thermal/ti-soc-thermal/ti-bandgap.c | 34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index d81af89..008fbed 100644
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
@@ -9,29 +9,29 @@
  *   Eduardo Valentin <eduardo.valentin@ti.com>
  */
 
-#include <linux/module.h>
+#include <linux/clk.h>
+#include <linux/cpu_pm.h>
+#include <linux/device.h>
+#include <linux/err.h>
 #include <linux/export.h>
+#include <linux/gpio/consumer.h>
 #include <linux/init.h>
-#include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/clk.h>
-#include <linux/gpio/consumer.h>
-#include <linux/platform_device.h>
-#include <linux/err.h>
-#include <linux/types.h>
-#include <linux/spinlock.h>
-#include <linux/sys_soc.h>
-#include <linux/reboot.h>
-#include <linux/of_device.h>
-#include <linux/of_platform.h>
-#include <linux/of_irq.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
-#include <linux/cpu_pm.h>
-#include <linux/device.h>
-#include <linux/pm_runtime.h>
-#include <linux/pm.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/pm.h>
+#include <linux/pm_runtime.h>
+#include <linux/reboot.h>
+#include <linux/spinlock.h>
+#include <linux/sys_soc.h>
+#include <linux/types.h>
 
 #include "ti-bandgap.h"