| Message ID | 20220122091731.283592-12-wenst@chromium.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | clk: mediatek: Cleanups and Improvements - Part 1 | expand |
> Some included headers aren't actually used anywhere, while other headers > with the declaration of functions and structures aren't directly > included. > > Get rid of the unused ones, and add the ones that should be included > directly. > > On the header side, replace headers that are included purely for data > structure definitions with forward declarations. This decreases the > amount of preprocessing and compilation effort required for each > inclusion. Is this inspired by [1]? [1] https://lore.kernel.org/lkml/YdIfz+LMewetSaEB@gmail.com/ > > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > Reviewed-by: Miles Chen <miles.chen@mediatek.com> > --- > drivers/clk/mediatek/clk-mux.c | 11 +++++++---- > drivers/clk/mediatek/clk-mux.h | 8 +++++++- > 2 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/drivers/clk/mediatek/clk-mux.c b/drivers/clk/mediatek/clk-mux.c > index 2d4d8dc0120a..01af6a52711a 100644 > --- a/drivers/clk/mediatek/clk-mux.c > +++ b/drivers/clk/mediatek/clk-mux.c > @@ -4,13 +4,16 @@ > * Author: Owen Chen <owen.chen@mediatek.com> > */ > > -#include <linux/of.h> > -#include <linux/of_address.h> > -#include <linux/slab.h> > +#include <linux/clk-provider.h> > +#include <linux/compiler_types.h> > +#include <linux/container_of.h> > +#include <linux/err.h> > #include <linux/mfd/syscon.h> > #include <linux/module.h> > +#include <linux/regmap.h> > +#include <linux/spinlock.h> > +#include <linux/slab.h> > > -#include "clk-mtk.h" > #include "clk-mux.h" > > struct mtk_clk_mux { > diff --git a/drivers/clk/mediatek/clk-mux.h b/drivers/clk/mediatek/clk-mux.h > index 38a2b6014b08..903a3c937959 100644 > --- a/drivers/clk/mediatek/clk-mux.h > +++ b/drivers/clk/mediatek/clk-mux.h > @@ -7,7 +7,13 @@ > #ifndef __DRV_CLK_MTK_MUX_H > #define __DRV_CLK_MTK_MUX_H > > -#include <linux/clk-provider.h> > +#include <linux/spinlock.h> > +#include <linux/types.h> > + > +struct clk; > +struct clk_onecell_data; > +struct clk_ops; > +struct device_node; > > struct mtk_mux { > int id; > -- > 2.35.0.rc0.227.g00780c9af4-goog
On Wed, Jan 26, 2022 at 1:38 AM Miles Chen <miles.chen@mediatek.com> wrote: > > > Some included headers aren't actually used anywhere, while other headers > > with the declaration of functions and structures aren't directly > > included. > > > > Get rid of the unused ones, and add the ones that should be included > > directly. > > > > On the header side, replace headers that are included purely for data > > structure definitions with forward declarations. This decreases the > > amount of preprocessing and compilation effort required for each > > inclusion. > > Is this inspired by [1]? > [1] https://lore.kernel.org/lkml/YdIfz+LMewetSaEB@gmail.com/ Yes and no. When clk-mtk.h was removed from the included headers, many headers had to be added. Also, clk-mux.h did not include any headers, so if it were to be used by itself, it probably would not compile. Using forward declarations for the data structures instead of including the header files inspired in part by that series though. ChenYu
diff --git a/drivers/clk/mediatek/clk-mux.c b/drivers/clk/mediatek/clk-mux.c index 2d4d8dc0120a..01af6a52711a 100644 --- a/drivers/clk/mediatek/clk-mux.c +++ b/drivers/clk/mediatek/clk-mux.c @@ -4,13 +4,16 @@ * Author: Owen Chen <owen.chen@mediatek.com> */ -#include <linux/of.h> -#include <linux/of_address.h> -#include <linux/slab.h> +#include <linux/clk-provider.h> +#include <linux/compiler_types.h> +#include <linux/container_of.h> +#include <linux/err.h> #include <linux/mfd/syscon.h> #include <linux/module.h> +#include <linux/regmap.h> +#include <linux/spinlock.h> +#include <linux/slab.h> -#include "clk-mtk.h" #include "clk-mux.h" struct mtk_clk_mux { diff --git a/drivers/clk/mediatek/clk-mux.h b/drivers/clk/mediatek/clk-mux.h index 38a2b6014b08..903a3c937959 100644 --- a/drivers/clk/mediatek/clk-mux.h +++ b/drivers/clk/mediatek/clk-mux.h @@ -7,7 +7,13 @@ #ifndef __DRV_CLK_MTK_MUX_H #define __DRV_CLK_MTK_MUX_H -#include <linux/clk-provider.h> +#include <linux/spinlock.h> +#include <linux/types.h> + +struct clk; +struct clk_onecell_data; +struct clk_ops; +struct device_node; struct mtk_mux { int id;
Some included headers aren't actually used anywhere, while other headers with the declaration of functions and structures aren't directly included. Get rid of the unused ones, and add the ones that should be included directly. On the header side, replace headers that are included purely for data structure definitions with forward declarations. This decreases the amount of preprocessing and compilation effort required for each inclusion. Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> --- drivers/clk/mediatek/clk-mux.c | 11 +++++++---- drivers/clk/mediatek/clk-mux.h | 8 +++++++- 2 files changed, 14 insertions(+), 5 deletions(-)