| Message ID | 20210406091912.2583-2-thunder.leizhen@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | thermal: ti-soc-thermal: Remove duplicated header file inclusion | expand |
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" > >
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
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"
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(-)