Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1188416
| From | Stephen Boyd <sboyd@codeaurora.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 33/45] clk: sunxi: Include clk.h |
| Date | 2015-07-20 20:10 +0200 |
| Message-ID | <pOnFM-nL-25@gated-at.bofh.it> (permalink) |
| References | <pKQ3D-3Sg-3@gated-at.bofh.it> <pKQ3F-3Sg-61@gated-at.bofh.it> <pOej8-3Of-31@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On 07/20/2015 01:01 AM, Maxime Ripard wrote: > Hi Stephen, > > On Fri, Jul 10, 2015 at 04:33:31PM -0700, Stephen Boyd wrote: >> This clock provider uses the consumer API, so include clk.h >> explicitly. >> >> Cc: Chen-Yu Tsai <wens@csie.org> >> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> >> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> --- >> drivers/clk/sunxi/clk-mod0.c | 3 ++- >> drivers/clk/sunxi/clk-sun8i-mbus.c | 2 +- >> drivers/clk/sunxi/clk-sun9i-core.c | 2 +- >> drivers/clk/sunxi/clk-sun9i-mmc.c | 3 ++- >> drivers/clk/sunxi/clk-sunxi.c | 2 ++ >> drivers/clk/sunxi/clk-usb.c | 3 ++- >> 6 files changed, 10 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/clk/sunxi/clk-mod0.c b/drivers/clk/sunxi/clk-mod0.c >> index 9d028aec58e5..39ba5c3d5d3a 100644 >> --- a/drivers/clk/sunxi/clk-mod0.c >> +++ b/drivers/clk/sunxi/clk-mod0.c >> @@ -14,8 +14,9 @@ >> * GNU General Public License for more details. >> */ >> >> +#include <linux/clk.h> >> #include <linux/clk-provider.h> >> -#include <linux/clkdev.h> >> +#include <linux/slab.h> > I guess you're adding a bit more that clk.h ;) > > Could you sort the headers alphabetically please? > Sure. ---8<---- From: Stephen Boyd <sboyd@codeaurora.org> Subject: [PATCH] clk: sunxi: Include clk.h and remove unused clkdev.h includes This clock provider uses the consumer API, so include clk.h explicitly. Also remove clkdev.h in files that aren't using it and include slab.h when clkdev.h was being used to implicitly include it. Cc: Chen-Yu Tsai <wens@csie.org> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/clk/sunxi/clk-mod0.c | 3 ++- drivers/clk/sunxi/clk-sun8i-mbus.c | 2 +- drivers/clk/sunxi/clk-sun9i-core.c | 2 +- drivers/clk/sunxi/clk-sun9i-mmc.c | 3 ++- drivers/clk/sunxi/clk-sunxi.c | 2 ++ drivers/clk/sunxi/clk-usb.c | 3 ++- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/clk/sunxi/clk-mod0.c b/drivers/clk/sunxi/clk-mod0.c index 9d028aec58e5..d167e1efb927 100644 --- a/drivers/clk/sunxi/clk-mod0.c +++ b/drivers/clk/sunxi/clk-mod0.c @@ -14,10 +14,11 @@ * GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/of_address.h> #include <linux/platform_device.h> +#include <linux/slab.h> #include "clk-factors.h" diff --git a/drivers/clk/sunxi/clk-sun8i-mbus.c b/drivers/clk/sunxi/clk-sun8i-mbus.c index 14cd026064bf..bf117a636d23 100644 --- a/drivers/clk/sunxi/clk-sun8i-mbus.c +++ b/drivers/clk/sunxi/clk-sun8i-mbus.c @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/of_address.h> #include "clk-factors.h" diff --git a/drivers/clk/sunxi/clk-sun9i-core.c b/drivers/clk/sunxi/clk-sun9i-core.c index 887f4ea161bb..6c4c98324d3c 100644 --- a/drivers/clk/sunxi/clk-sun9i-core.c +++ b/drivers/clk/sunxi/clk-sun9i-core.c @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/log2.h> diff --git a/drivers/clk/sunxi/clk-sun9i-mmc.c b/drivers/clk/sunxi/clk-sun9i-mmc.c index 710c273648d7..3436a948b796 100644 --- a/drivers/clk/sunxi/clk-sun9i-mmc.c +++ b/drivers/clk/sunxi/clk-sun9i-mmc.c @@ -14,14 +14,15 @@ * GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> #include <linux/reset.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> +#include <linux/slab.h> #include <linux/spinlock.h> #define SUN9I_MMC_WIDTH 4 diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 9a82f17d2d73..4ac26122a7c6 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -14,11 +14,13 @@ * GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/reset-controller.h> +#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/log2.h> diff --git a/drivers/clk/sunxi/clk-usb.c b/drivers/clk/sunxi/clk-usb.c index 3a25f9588e67..1a72cd672839 100644 --- a/drivers/clk/sunxi/clk-usb.c +++ b/drivers/clk/sunxi/clk-usb.c @@ -14,11 +14,12 @@ * GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/reset-controller.h> +#include <linux/slab.h> #include <linux/spinlock.h> -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/45] Remove clk.h from clk-provider.h (clk drivers part) Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 31/45] clk: qcom: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 01/45] clk: axi-clkgen: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 16/45] clk: meson8b: Properly include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 39/45] clk: si570: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 30/45] clk: highbank: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 09/45] clk: si5351: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 08/45] clk: rk808: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 06/45] clk: nomadik: Remove clk.h and clkdev.h includes Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 45/45] clk: Remove clk.h from clk-provider.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 15/45] clk: mediatek: Properly include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 21/45] clk: rockchip: Properly include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 23/45] clk: sirf: Properly include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 42/45] clk: samsung: s5pv210-audss: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 27/45] clk: ux500: Remove clk.h and clkdev.h includes Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 34/45] clk: ti: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
Re: [PATCH 34/45] clk: ti: Include clk.h Tero Kristo <t-kristo@ti.com> - 2015-07-13 11:40 +0200
[PATCH 04/45] clk: efm32gg: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
Re: [PATCH 04/45] clk: efm32gg: Remove clk.h include Uwe Kleine-König <u.kleine-koenig@pengutronix.de> - 2015-07-11 19:30 +0200
[PATCH 44/45] clk: at91: Include clk.h and slab.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 12/45] clk: wm831x: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 25/45] clk: socfpga: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 22/45] clk: samsung: Properly include clk.h and clkdev.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 40/45] clk: ingenic: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 07/45] clk: palmas: Remove clkdev.h includes Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 41/45] clk: pistachio: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 18/45] clk: mvebu: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 33/45] clk: sunxi: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
Re: [PATCH 33/45] clk: sunxi: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-20 20:10 +0200
[PATCH 11/45] clk: u300: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 28/45] clk: versatile: Remove clk.h and clkdev.h includes Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 26/45] clk: tegra: Properly include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 37/45] clk: cdce925: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 02/45] clk: cdce706: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 19/45] clk: mxs: Include clk.h in C files that use it Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 13/45] clk: hisilicon: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 05/45] clk: mux: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 10/45] clk: twl6040: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 29/45] clk: bcm: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
Re: [PATCH 29/45] clk: bcm: Include clk.h Alex Elder <elder@linaro.org> - 2015-07-13 14:50 +0200
[PATCH 17/45] clk: mmp: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 14/45] clk: keystone: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 32/45] clk: st: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 03/45] clk: clps711x: Remove clk.h include Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:40 +0200
[PATCH 36/45] clk: Include clk.h in clk.c Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:50 +0200
[PATCH 38/45] clk: moxart: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:50 +0200
[PATCH 35/45] clk: zynq: Include clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:50 +0200
[PATCH 43/45] clk: ti: Switch clk-provider.h include to clk.h Stephen Boyd <sboyd@codeaurora.org> - 2015-07-11 01:50 +0200
Re: [PATCH 43/45] clk: ti: Switch clk-provider.h include to clk.h Tero Kristo <t-kristo@ti.com> - 2015-07-13 11:40 +0200
csiph-web