[PATCH 1/2] clk: cosmetic: reorder include files

[Sean Anderson]

On 11/19/21 9:12 AM, Patrick Delaunay wrote:
> Reorder include files in the U-Boot expected order:
> 
> the common.h header should always be first,
> followed by other headers in order,
> then headers with directories,
> then local files.
> 
> It is a preliminary step for next patch.
> 
> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
> 
>   drivers/clk/clk-composite.c    | 6 +++---
>   drivers/clk/clk-fixed-factor.c | 9 +++++----
>   drivers/clk/clk-gate.c         | 9 +++++----
>   drivers/clk/clk-mux.c          | 5 +++--
>   drivers/clk/clk-uclass.c       | 2 +-
>   drivers/clk/clk.c              | 2 +-
>   6 files changed, 18 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
> index bb5351ebc0..12288e10b3 100644
> --- a/drivers/clk/clk-composite.c
> +++ b/drivers/clk/clk-composite.c
> @@ -5,13 +5,13 @@
>    */
>   
>   #include <common.h>
> -#include <asm/io.h>
> -#include <malloc.h>
> +#include <clk.h>
>   #include <clk-uclass.h>
> +#include <malloc.h>
> +#include <asm/io.h>
>   #include <dm/device.h>
>   #include <dm/devres.h>
>   #include <linux/clk-provider.h>
> -#include <clk.h>
>   #include <linux/err.h>
>   
>   #include "clk.h"
> diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
> index 8d9823bdab..9fcf30fd2e 100644
> --- a/drivers/clk/clk-fixed-factor.c
> +++ b/drivers/clk/clk-fixed-factor.c
> @@ -6,16 +6,17 @@
>    * Copyright (C) 2011 Sascha Hauer, Pengutronix <s.hauer at pengutronix.de>
>    */
>   #include <common.h>
> -#include <malloc.h>
> +#include <clk.h>
>   #include <clk-uclass.h>
> +#include <div64.h>
> +#include <malloc.h>
>   #include <dm/device.h>
>   #include <dm/devres.h>
>   #include <linux/clk-provider.h>
> -#include <div64.h>
> -#include <clk.h>
> -#include "clk.h"
>   #include <linux/err.h>
>   
> +#include "clk.h"
> +
>   #define UBOOT_DM_CLK_IMX_FIXED_FACTOR "ccf_clk_fixed_factor"
>   
>   static ulong clk_factor_recalc_rate(struct clk *clk)
> diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
> index 006d3b6629..708499d95a 100644
> --- a/drivers/clk/clk-gate.c
> +++ b/drivers/clk/clk-gate.c
> @@ -8,17 +8,18 @@
>    */
>   
>   #include <common.h>
> -#include <asm/io.h>
> -#include <malloc.h>
> +#include <clk.h>
>   #include <clk-uclass.h>
> +#include <malloc.h>
> +#include <asm/io.h>
>   #include <dm/device.h>
>   #include <dm/devres.h>
>   #include <linux/bitops.h>
>   #include <linux/clk-provider.h>
> -#include <clk.h>
> -#include "clk.h"
>   #include <linux/err.h>
>   
> +#include "clk.h"
> +
>   #define UBOOT_DM_CLK_GATE "clk_gate"
>   
>   /**
> diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
> index f1becd20d8..fd746f2de3 100644
> --- a/drivers/clk/clk-mux.c
> +++ b/drivers/clk/clk-mux.c
> @@ -24,14 +24,15 @@
>   #include <common.h>
>   #include <clk.h>
>   #include <clk-uclass.h>
> +#include <malloc.h>
> +#include <asm/io.h>
>   #include <dm/device.h>
>   #include <dm/devres.h>
>   #include <dm/uclass.h>
>   #include <linux/bitops.h>
> -#include <malloc.h>
> -#include <asm/io.h>
>   #include <linux/clk-provider.h>
>   #include <linux/err.h>
> +
>   #include "clk.h"
>   
>   #define UBOOT_DM_CLK_CCF_MUX "ccf_clk_mux"
> diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
> index 493018b33e..f2d2642754 100644
> --- a/drivers/clk/clk-uclass.c
> +++ b/drivers/clk/clk-uclass.c
> @@ -16,6 +16,7 @@
>   #include <errno.h>
>   #include <log.h>
>   #include <malloc.h>
> +#include <asm/global_data.h>
>   #include <dm/device_compat.h>
>   #include <dm/device-internal.h>
>   #include <dm/devres.h>
> @@ -23,7 +24,6 @@
>   #include <linux/bug.h>
>   #include <linux/clk-provider.h>
>   #include <linux/err.h>
> -#include <asm/global_data.h>
>   
>   static inline const struct clk_ops *clk_dev_ops(struct udevice *dev)
>   {
> diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
> index 1efb7fe9f3..d1a9787071 100644
> --- a/drivers/clk/clk.c
> +++ b/drivers/clk/clk.c
> @@ -5,13 +5,13 @@
>    */
>   
>   #include <common.h>
> +#include <clk.h>
>   #include <clk-uclass.h>
>   #include <log.h>
>   #include <dm/device.h>
>   #include <dm/uclass.h>
>   #include <dm/lists.h>
>   #include <dm/device-internal.h>
> -#include <clk.h>
>   
>   int clk_register(struct clk *clk, const char *drv_name,
>   		 const char *name, const char *parent_name)
> 

Reviewed-by: Sean Anderson <seanga2 at gmail.com>