Remove clk.h from clk-provider.h (clk drivers part)
Subsystems (31)
cover Remove clk.h from clk-provider.h (clk drivers part)
This is the third set in a series of patches that removes clk.h from clk-provider.h. This allows us to clearly see what provider drivers are using the consumer API (clk.h) by checking the includes. Currently clk.h is included by clk-provider.h even though it doesn't need to, so quite a few clk provider drivers are relying on the implicit include.
Stephen Boyd (45):
clk: axi-clkgen: Remove clk.h include
clk: cdce706: Include clk.h
clk: clps711x: Remove clk.h include
clk: efm32gg: Remove clk.h include
clk: mux: Remove clk.h include
clk: nomadik: Remove clk.h and clkdev.h includes
clk: palmas: Remove clkdev.h includes
clk: rk808: Remove clk.h include
clk: si5351: Include clk.h
clk: twl6040: Remove clk.h include
clk: u300: Remove clk.h include
clk: wm831x: Remove clk.h include
clk: hisilicon: Remove clk.h include
clk: keystone: Remove clk.h include
clk: mediatek: Properly include clk.h
clk: meson8b: Properly include clk.h
clk: mmp: Remove clk.h include
clk: mvebu: Remove clk.h include
clk: mxs: Include clk.h in C files that use it
clk: nxp: Remove clk.h include
clk: rockchip: Properly include clk.h
clk: samsung: Properly include clk.h and clkdev.h
clk: sirf: Properly include clk.h
clk: socfpga: Remove clk.h and clkdev.h includes
clk: socfpga: Remove clk.h include
clk: tegra: Properly include clk.h
clk: ux500: Remove clk.h and clkdev.h includes
clk: versatile: Remove clk.h and clkdev.h includes
clk: bcm: Include clk.h
clk: highbank: Include clk.h
clk: qcom: Include clk.h
clk: st: Include clk.h
clk: sunxi: Include clk.h
clk: ti: Include clk.h
clk: zynq: Include clk.h
clk: Include clk.h in clk.c
clk: cdce925: Include clk.h
clk: moxart: Include clk.h
clk: si570: Include clk.h
clk: ingenic: Include clk.h
clk: pistachio: Include clk.h
clk: samsung: s5pv210-audss: Include clk.h
clk: ti: Switch clk-provider.h include to clk.h
clk: at91: Include clk.h and slab.h
clk: Remove clk.h from clk-provider.h
drivers/clk/at91/clk-slow.c | 2 ++ drivers/clk/bcm/clk-kona.c | 1 + drivers/clk/clk-axi-clkgen.c | 1 - drivers/clk/clk-cdce706.c | 1 + drivers/clk/clk-cdce925.c | 1 + drivers/clk/clk-clps711x.c | 1 - drivers/clk/clk-efm32gg.c | 1 - drivers/clk/clk-highbank.c | 1 + drivers/clk/clk-moxart.c | 1 + drivers/clk/clk-mux.c | 1 - drivers/clk/clk-nomadik.c | 3 +-- drivers/clk/clk-palmas.c | 1 - drivers/clk/clk-rk808.c | 1 - drivers/clk/clk-si5351.c | 2 +- drivers/clk/clk-si570.c | 1 + drivers/clk/clk-twl6040.c | 1 - drivers/clk/clk-u300.c | 2 +- drivers/clk/clk-wm831x.c | 1 - drivers/clk/clk.c | 1 + drivers/clk/hisilicon/clk-hi3620.c | 2 -- drivers/clk/hisilicon/clk-hip04.c | 2 -- drivers/clk/hisilicon/clk.c | 3 +-- drivers/clk/hisilicon/clkgate-separated.c | 2 -- drivers/clk/ingenic/cgu.c | 1 + drivers/clk/keystone/gate.c | 1 - drivers/clk/keystone/pll.c | 1 - drivers/clk/mediatek/clk-gate.h | 3 ++- drivers/clk/mediatek/clk-mt8135.c | 1 + drivers/clk/mediatek/clk-mt8173.c | 1 + drivers/clk/mediatek/clk-mtk.h | 3 ++- drivers/clk/meson/clk-cpu.c | 1 + drivers/clk/meson/clkc.c | 1 - drivers/clk/mmp/clk-apbc.c | 1 - drivers/clk/mmp/clk-apmu.c | 1 - drivers/clk/mmp/clk.c | 3 +-- drivers/clk/mvebu/clk-cpu.c | 3 ++- drivers/clk/mvebu/common.c | 2 +- drivers/clk/mxs/clk-div.c | 1 - drivers/clk/mxs/clk-frac.c | 1 - drivers/clk/mxs/clk-imx23.c | 3 +-- drivers/clk/mxs/clk-imx28.c | 2 +- drivers/clk/mxs/clk-pll.c | 1 - drivers/clk/mxs/clk-ref.c | 1 - drivers/clk/mxs/clk.h | 3 ++- drivers/clk/nxp/clk-lpc18xx-cgu.c | 1 - drivers/clk/pistachio/clk.c | 1 + drivers/clk/qcom/mmcc-msm8960.c | 1 + drivers/clk/rockchip/clk-cpu.c | 1 + drivers/clk/rockchip/clk-mmc-phase.c | 1 + drivers/clk/rockchip/clk-pll.c | 1 - drivers/clk/rockchip/clk-rk3188.c | 1 + drivers/clk/rockchip/clk.h | 4 ++-- drivers/clk/samsung/clk-cpu.c | 3 +++ drivers/clk/samsung/clk-exynos-audss.c | 3 ++- drivers/clk/samsung/clk-exynos-clkout.c | 2 +- drivers/clk/samsung/clk-exynos3250.c | 2 -- drivers/clk/samsung/clk-exynos4.c | 2 +- drivers/clk/samsung/clk-exynos4415.c | 2 -- drivers/clk/samsung/clk-exynos5250.c | 2 -- drivers/clk/samsung/clk-exynos5260.c | 2 -- drivers/clk/samsung/clk-exynos5410.c | 2 -- drivers/clk/samsung/clk-exynos5420.c | 3 +-- drivers/clk/samsung/clk-exynos5433.c | 2 -- drivers/clk/samsung/clk-exynos5440.c | 2 -- drivers/clk/samsung/clk-exynos7.c | 2 -- drivers/clk/samsung/clk-pll.c | 2 ++ drivers/clk/samsung/clk-s3c2410.c | 2 -- drivers/clk/samsung/clk-s3c2412.c | 2 -- drivers/clk/samsung/clk-s3c2443.c | 2 -- drivers/clk/samsung/clk-s3c64xx.c | 2 -- drivers/clk/samsung/clk-s5pv210-audss.c | 2 +- drivers/clk/samsung/clk-s5pv210.c | 2 -- drivers/clk/samsung/clk.c | 4 ++++ drivers/clk/samsung/clk.h | 3 ++- drivers/clk/sirf/clk-atlas6.c | 1 - drivers/clk/sirf/clk-common.c | 2 ++ drivers/clk/sirf/clk-prima2.c | 1 - drivers/clk/socfpga/clk-gate-a10.c | 1 + drivers/clk/socfpga/clk-gate.c | 3 +-- drivers/clk/socfpga/clk-periph-a10.c | 1 + drivers/clk/socfpga/clk-periph.c | 3 +-- drivers/clk/socfpga/clk-pll-a10.c | 1 + drivers/clk/socfpga/clk-pll.c | 3 +-- drivers/clk/socfpga/clk.h | 1 - drivers/clk/spear/spear1310_clock.c | 1 - drivers/clk/spear/spear1340_clock.c | 1 - drivers/clk/spear/spear3xx_clock.c | 1 - drivers/clk/spear/spear6xx_clock.c | 1 - drivers/clk/st/clk-flexgen.c | 1 + drivers/clk/st/clkgen-fsyn.c | 1 + drivers/clk/st/clkgen-mux.c | 1 + drivers/clk/st/clkgen-pll.c | 1 + 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 ++- drivers/clk/tegra/clk-divider.c | 1 - drivers/clk/tegra/clk-periph-gate.c | 1 - drivers/clk/tegra/clk-periph.c | 1 - drivers/clk/tegra/clk-pll-out.c | 1 - drivers/clk/tegra/clk-pll.c | 2 +- drivers/clk/tegra/clk-super.c | 1 - drivers/clk/tegra/clk-tegra-audio.c | 1 - drivers/clk/tegra/clk-tegra-fixed.c | 1 - drivers/clk/tegra/clk-tegra-periph.c | 1 - drivers/clk/tegra/clk-tegra-pmc.c | 1 - drivers/clk/tegra/clk-tegra-super-gen4.c | 1 - drivers/clk/tegra/clk-tegra114.c | 2 -- drivers/clk/tegra/clk-tegra124.c | 1 - drivers/clk/tegra/clk-tegra20.c | 1 - drivers/clk/tegra/clk-tegra30.c | 1 - drivers/clk/tegra/clk.c | 1 + drivers/clk/ti/apll.c | 1 + drivers/clk/ti/clk-2xxx.c | 2 +- drivers/clk/ti/clk-33xx.c | 1 + drivers/clk/ti/clk-3xxx-legacy.c | 1 + drivers/clk/ti/clk-3xxx.c | 1 + drivers/clk/ti/clk-43xx.c | 1 + drivers/clk/ti/clk-dra7-atl.c | 1 + drivers/clk/ti/clk.c | 1 + drivers/clk/ti/clockdomain.c | 1 + drivers/clk/ti/dpll.c | 1 + drivers/clk/ti/fapll.c | 1 + drivers/clk/ux500/abx500-clk.c | 1 - drivers/clk/ux500/clk.h | 3 ++- drivers/clk/ux500/u8500_clk.c | 1 - drivers/clk/ux500/u8500_of_clk.c | 2 -- drivers/clk/ux500/u8540_clk.c | 1 - drivers/clk/ux500/u9540_clk.c | 2 -- drivers/clk/versatile/clk-icst.c | 5 +++-- drivers/clk/versatile/clk-impd1.c | 1 - drivers/clk/versatile/clk-realview.c | 1 - drivers/clk/versatile/clk-sp810.c | 3 ++- drivers/clk/versatile/clk-versatile.c | 2 -- drivers/clk/zynq/clkc.c | 1 + include/linux/clk-provider.h | 2 +- include/linux/clk/tegra.h | 3 ++- 139 files changed, 99 insertions(+), 128 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/45 clk: axi-clkgen: Remove clk.h include
Clock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/clk-axi-clkgen.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/clk-axi-clkgen.c +0 -1
@@ -10,7 +10,6 @@#include <linux/platform_device.h> #include <linux/clk-provider.h> -#include <linux/clk.h> #include <linux/slab.h> #include <linux/io.h> #include <linux/of.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 2/45 clk: cdce706: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/clk-cdce706.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk-cdce706.c +1 -0
@@ -10,6 +10,7 @@* published by the Free Software Foundation. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/i2c.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 3/45 clk: clps711x: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/clk-clps711x.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/clk-clps711x.c +0 -1
@@ -9,7 +9,6 @@* (at your option) any later version. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/io.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 4/45 clk: efm32gg: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/clk-efm32gg.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/clk-efm32gg.c +0 -1
@@ -6,7 +6,6 @@* the terms of the GNU General Public License version 2 as published by the * Free Software Foundation. */ -#include <linux/clk.h> #include <linux/io.h> #include <linux/clk-provider.h> #include <linux/of.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 04/45] clk: efm32gg: Remove clk.h include
Quoted 6 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Remove the include here because this is a provider driver.Cc Uwe Kleine-König <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Still compiles with your change, so fine.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 5/45 clk: mux: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/clk-mux.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/clk-mux.c +0 -1
@@ -10,7 +10,6 @@* Simple multiplexer clock implementation */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/module.h> #include <linux/slab.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 6/45 clk: nomadik: Remove clk.h and clkdev.h includes
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver. This driver also includes clkdev.h even though it isn't used, so drop it too and add slab.h to make sure everything still compiles.
--- drivers/clk/clk-nomadik.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/clk/clk-nomadik.c +1 -2
@@ -8,8 +8,7 @@#define pr_fmt (fmt) "Nomadik SRC clocks: " fmt#include <linux/bitops.h> -#include <linux/clk.h> -#include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/err.h> #include <linux/io.h> #include <linux/clk-provider.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 06/45] clk: nomadik: Remove clk.h and clkdev.h includes
Quoted 8 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Remove the include here because this is a provider driver. This driver also includesclkdev.heven though it isn't used, so drop it too and addslab.hto make sure everything still compiles.Cc Linus Walleij <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Yours,
Linus Walleij
PATCH 7/45 clk: palmas: Remove clkdev.h includes
In reply to Stephen BoydThis driver includes clkdev.h even though it isn't used, so drop it.
--- drivers/clk/clk-palmas.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/clk-palmas.c +0 -1
@@ -18,7 +18,6 @@*/ #include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/palmas.h> #include <linux/module.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 8/45 clk: rk808: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/clk-rk808.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/clk-rk808.c +0 -1
@@ -15,7 +15,6 @@* more details. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/module.h> #include <linux/slab.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 9/45 clk: si5351: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/clk-si5351.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-si5351.c +1 -1
@@ -18,7 +18,7 @@#include <linux/module.h> #include <linux/kernel.h> -#include <linux/clkdev.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/err.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 10/45 clk: twl6040: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/clk-twl6040.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/clk-twl6040.c +0 -1
@@ -20,7 +20,6 @@* */ -#include <linux/clk.h> #include <linux/module.h> #include <linux/slab.h> #include <linux/platform_device.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 11/45 clk: u300: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver. Also add in slab.h because without clkdev.h compilation of this file would fail.
--- drivers/clk/clk-u300.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-u300.c +1 -1
@@ -5,8 +5,8 @@* Author: Linus Walleij <[email protected]> * Author: Jonas Aaberg <[email protected]> */ -#include <linux/clk.h> #include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/err.h> #include <linux/io.h> #include <linux/clk-provider.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 11/45] clk: u300: Remove clk.h include
Quoted 7 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Remove the include here because this is a provider driver. Also add inslab.hbecause withoutclkdev.hcompilation of this file would fail.Cc Linus Walleij <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Yours,
Linus Walleij
PATCH 12/45 clk: wm831x: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/clk-wm831x.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/clk-wm831x.c +0 -1
@@ -12,7 +12,6 @@* */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/module.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 13/45 clk: hisilicon: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver. Also drop the clkdev.h include in files that aren't using it.
--- drivers/clk/hisilicon/clk-hi3620.c | 2 -- drivers/clk/hisilicon/clk-hip04.c | 2 -- drivers/clk/hisilicon/clk.c | 3 +-- drivers/clk/hisilicon/clkgate-separated.c | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-)
drivers/clk/hisilicon/clk-hi3620.c +0 -2
@@ -25,13 +25,11 @@#include <linux/kernel.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/io.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/slab.h> -#include <linux/clk.h> #include <dt-bindings/clock/hi3620-clock.h>
drivers/clk/hisilicon/clk-hip04.c +0 -2
@@ -24,13 +24,11 @@#include <linux/kernel.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/io.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/slab.h> -#include <linux/clk.h> #include <dt-bindings/clock/hip04-clock.h>
drivers/clk/hisilicon/clk.c +1 -2
@@ -24,15 +24,14 @@*/ #include <linux/kernel.h> -#include <linux/clk-provider.h> #include <linux/clkdev.h> +#include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/io.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/slab.h> -#include <linux/clk.h> #include "clk.h"
drivers/clk/hisilicon/clkgate-separated.c +0 -2
@@ -25,10 +25,8 @@#include <linux/kernel.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/io.h> #include <linux/slab.h> -#include <linux/clk.h> #include "clk.h"
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 14/45 clk: keystone: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/keystone/gate.c | 1 - drivers/clk/keystone/pll.c | 1 - 2 files changed, 2 deletions(-)
drivers/clk/keystone/gate.c +0 -1
@@ -10,7 +10,6 @@* the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/io.h>
drivers/clk/keystone/pll.c +0 -1
@@ -10,7 +10,6 @@* the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/io.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 15/45 clk: mediatek: Properly include clk.h
In reply to Stephen BoydWe don't need to include clk.h in header files, just forward declare struct clk here. This leads us to a few places where the include of clk.h was missing in C files. Add them.
--- drivers/clk/mediatek/clk-gate.h | 3 ++- drivers/clk/mediatek/clk-mt8135.c | 1 + drivers/clk/mediatek/clk-mt8173.c | 1 + drivers/clk/mediatek/clk-mtk.h | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-)
drivers/clk/mediatek/clk-gate.h +2 -1
@@ -16,9 +16,10 @@#define __DRV_CLK_GATE_H#include <linux/regmap.h> -#include <linux/clk.h> #include <linux/clk-provider.h> +struct clk ; +struct mtk_clk_gate {struct clk_hw hw;struct regmap *regmap;
drivers/clk/mediatek/clk-mt8135.c +1 -0
@@ -12,6 +12,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/slab.h>
drivers/clk/mediatek/clk-mt8173.c +1 -0
@@ -12,6 +12,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/slab.h>
drivers/clk/mediatek/clk-mtk.h +2 -1
@@ -17,9 +17,10 @@#include <linux/regmap.h> #include <linux/bitops.h> -#include <linux/clk.h> #include <linux/clk-provider.h> +struct clk ; +#define MAX_MUX_GATE_BIT 31#define INVALID_MUX_GATE_BIT (MAX_MUX_GATE_BIT + 1)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 16/45 clk: meson8b: Properly include clk.h
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Only include clk.h if it's actually used.
--- drivers/clk/meson/clk-cpu.c | 1 + drivers/clk/meson/clkc.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
drivers/clk/meson/clk-cpu.c +1 -0
@@ -35,6 +35,7 @@#include <linux/module.h> #include <linux/of_address.h> #include <linux/slab.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #define MESON_CPU_CLK_CNTL1 0x00
drivers/clk/meson/clkc.c +0 -1
@@ -15,7 +15,6 @@* this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/mfd/syscon.h> #include <linux/slab.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 17/45 clk: mmp: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver. The clkdev.h include isn't used either, so drop it and add in slab.h to keep things compiling.
--- drivers/clk/mmp/clk-apbc.c | 1 - drivers/clk/mmp/clk-apmu.c | 1 - drivers/clk/mmp/clk.c | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-)
drivers/clk/mmp/clk-apbc.c +0 -1
@@ -10,7 +10,6 @@*/ #include <linux/kernel.h> -#include <linux/clk.h> #include <linux/io.h> #include <linux/err.h> #include <linux/delay.h>
drivers/clk/mmp/clk-apmu.c +0 -1
@@ -10,7 +10,6 @@*/ #include <linux/kernel.h> -#include <linux/clk.h> #include <linux/io.h> #include <linux/err.h> #include <linux/delay.h>
drivers/clk/mmp/clk.c +1 -2
@@ -1,7 +1,6 @@#include <linux/io.h> -#include <linux/clk.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/of.h> #include <linux/of_address.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 18/45 clk: mvebu: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Only include the header if necessary. The clkdev.h include isn't used here either, so drop it and add in slab.h to keep things compiling.
--- drivers/clk/mvebu/clk-cpu.c | 3 ++- drivers/clk/mvebu/common.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/clk/mvebu/clk-cpu.c +2 -1
@@ -10,7 +10,8 @@* warranty of any kind, whether express or implied. */ #include <linux/kernel.h> -#include <linux/clkdev.h> +#include <linux/slab.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of_address.h> #include <linux/io.h>
drivers/clk/mvebu/common.c +1 -1
@@ -13,8 +13,8 @@*/ #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/of.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 18/45] clk: mvebu: Remove clk.h include
Adding the mvebu maintainers in Cc.
Quoted 40 lines · On Fri, 10 Jul 2015 16:33:16 -0700 Stephen Boyd <[email protected]> wrote:
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Only include the header if necessary. Theclkdev.hinclude isn't used here either, so drop it and add inslab.hto keep things compiling.Cc Boris Brezillon <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- drivers/clk/mvebu/clk-cpu.c | 3 ++- drivers/clk/mvebu/common.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)drivers/clk/mvebu/clk-cpu.c +2
-1@@ -10,7 +10,8 @@* warranty of any kind, whether express or implied. */ #include <linux/kernel.h> -#include <linux/clkdev.h> +#include <linux/slab.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of_address.h> #include <linux/io.h> drivers/clk/mvebu/common.c +1
-1@@ -13,8 +13,8 @@*/ #include <linux/kernel.h> +#include <linux/slab.h> #include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/of.h>
Signature · 3 lines
Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 19/45 clk: mxs: Include clk.h in C files that use it
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. The clk.h include is being included in all mxs files because it's part of mxs/clk.h even though nothing actually requires it in that file. Move the clk.h include to the C files that are actually using it and remove the clk.h include from the header file. The clkdev.h include isn't used either, so drop it too.
--- drivers/clk/mxs/clk-div.c | 1 - drivers/clk/mxs/clk-frac.c | 1 - drivers/clk/mxs/clk-imx23.c | 3 +-- drivers/clk/mxs/clk-imx28.c | 2 +- drivers/clk/mxs/clk-pll.c | 1 - drivers/clk/mxs/clk-ref.c | 1 - drivers/clk/mxs/clk.h | 3 ++- 7 files changed, 4 insertions(+), 8 deletions(-)
drivers/clk/mxs/clk-div.c +0 -1
@@ -9,7 +9,6 @@* http://www.gnu.org/copyleft/gpl.html */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/slab.h>
drivers/clk/mxs/clk-frac.c +0 -1
@@ -9,7 +9,6 @@* http://www.gnu.org/copyleft/gpl.html */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/io.h>
drivers/clk/mxs/clk-imx23.c +1 -2
@@ -9,9 +9,8 @@* http://www.gnu.org/copyleft/gpl.html */ -#include <linux/clk.h> #include <linux/clk/mxs.h> -#include <linux/clkdev.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/init.h>
drivers/clk/mxs/clk-imx28.c +1 -1
@@ -9,9 +9,9 @@* http://www.gnu.org/copyleft/gpl.html */ -#include <linux/clk.h> #include <linux/clk/mxs.h> #include <linux/clkdev.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/init.h>
drivers/clk/mxs/clk-pll.c +0 -1
@@ -9,7 +9,6 @@* http://www.gnu.org/copyleft/gpl.html */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/err.h>
drivers/clk/mxs/clk-ref.c +0 -1
@@ -9,7 +9,6 @@* http://www.gnu.org/copyleft/gpl.html */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/io.h>
drivers/clk/mxs/clk.h +2 -1
@@ -12,7 +12,8 @@#ifndef __MXS_CLK_H#define __MXS_CLK_H -#include <linux/clk.h> +struct clk ; +#include <linux/clk-provider.h> #include <linux/spinlock.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 19/45] clk: mxs: Include clk.h in C files that use it
Quoted 10 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Theclk.hinclude is being included in all mxs files because it's part ofmxs/clk.heven though nothing actually requires it in that file. Move theclk.hinclude to the C files that are actually using it and remove theclk.hinclude from the header file. Theclkdev.hinclude isn't used either, so drop it too.Cc Shawn Guo <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
PATCH 20/45 clk: nxp: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/nxp/clk-lpc18xx-cgu.c | 1 - 1 file changed, 1 deletion(-)
drivers/clk/nxp/clk-lpc18xx-cgu.c +0 -1
@@ -8,7 +8,6 @@* warranty of any kind, whether express or implied. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/kernel.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 20/45] clk: nxp: Remove clk.h include
Quoted 6 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Remove the include here because this is a provider driver.Cc Joachim Eastwood <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
PATCH 21/45 clk: rockchip: Properly include clk.h
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Only include clk.h if it's actually used.
--- drivers/clk/rockchip/clk-cpu.c | 1 + drivers/clk/rockchip/clk-mmc-phase.c | 1 + drivers/clk/rockchip/clk-pll.c | 1 - drivers/clk/rockchip/clk-rk3188.c | 1 + drivers/clk/rockchip/clk.h | 4 ++-- 5 files changed, 5 insertions(+), 3 deletions(-)
drivers/clk/rockchip/clk-cpu.c +1 -0
@@ -35,6 +35,7 @@#include <linux/of.h> #include <linux/slab.h> #include <linux/io.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include "clk.h"
drivers/clk/rockchip/clk-mmc-phase.c +1 -0
@@ -14,6 +14,7 @@*/ #include <linux/slab.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include "clk.h"
drivers/clk/rockchip/clk-pll.c +0 -1
@@ -17,7 +17,6 @@#include <linux/slab.h> #include <linux/io.h> #include <linux/delay.h> -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/regmap.h> #include "clk.h"
drivers/clk/rockchip/clk-rk3188.c +1 -0
@@ -13,6 +13,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/rockchip/clk.h +2 -2
@@ -24,8 +24,8 @@#define CLK_ROCKCHIP_CLK_H #include <linux/io.h> -#include <linux/clk.h> -#include <linux/clk-provider.h> + +struct clk ;#define HIWORD_UPDATE (val, mask, shift) \ ((val) << (shift) | (mask) << ((shift) + 16))
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 22/45 clk: samsung: Properly include clk.h and clkdev.h
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Only include clk.h in files that are using it. The clkdev.h header isn't always used either, so remove it and add in slab.h where files were relying on it to include slab for them.
--- drivers/clk/samsung/clk-cpu.c | 3 +++ drivers/clk/samsung/clk-exynos-audss.c | 3 ++- drivers/clk/samsung/clk-exynos-clkout.c | 2 +- drivers/clk/samsung/clk-exynos3250.c | 2 -- drivers/clk/samsung/clk-exynos4.c | 2 +- drivers/clk/samsung/clk-exynos4415.c | 2 -- drivers/clk/samsung/clk-exynos5250.c | 2 -- drivers/clk/samsung/clk-exynos5260.c | 2 -- drivers/clk/samsung/clk-exynos5410.c | 2 -- drivers/clk/samsung/clk-exynos5420.c | 3 +-- drivers/clk/samsung/clk-exynos5433.c | 2 -- drivers/clk/samsung/clk-exynos5440.c | 2 -- drivers/clk/samsung/clk-exynos7.c | 2 -- drivers/clk/samsung/clk-pll.c | 2 ++ drivers/clk/samsung/clk-s3c2410.c | 2 -- drivers/clk/samsung/clk-s3c2412.c | 2 -- drivers/clk/samsung/clk-s3c2443.c | 2 -- drivers/clk/samsung/clk-s3c64xx.c | 2 -- drivers/clk/samsung/clk-s5pv210.c | 2 -- drivers/clk/samsung/clk.c | 4 ++++ drivers/clk/samsung/clk.h | 3 ++- 21 files changed, 16 insertions(+), 32 deletions(-)
drivers/clk/samsung/clk-cpu.c +3 -0
@@ -33,6 +33,9 @@*/ #include <linux/errno.h> +#include <linux/slab.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> #include "clk-cpu.h" #define E4210_SRC_CPU 0x0
drivers/clk/samsung/clk-exynos-audss.c +2 -1
@@ -9,8 +9,9 @@* Common Clock Framework support for Audio Subsystem Clock Controller. */ -#include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/io.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of_address.h> #include <linux/syscore_ops.h>
drivers/clk/samsung/clk-exynos-clkout.c +1 -1
@@ -9,8 +9,8 @@* Clock driver for Exynos clock output */ +#include <linux/slab.h> #include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-exynos3250.c +0 -2
@@ -8,8 +8,6 @@* Common Clock Framework support for Exynos3250 SoC. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-exynos4.c +1 -1
@@ -11,8 +11,8 @@*/ #include <dt-bindings/clock/exynos4.h> +#include <linux/slab.h> #include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-exynos4415.c +0 -2
@@ -9,8 +9,6 @@* Common Clock Framework support for Exynos4415 SoC. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-exynos5250.c +0 -2
@@ -11,8 +11,6 @@*/ #include <dt-bindings/clock/exynos5250.h> -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-exynos5260.c +0 -2
@@ -9,8 +9,6 @@* Common Clock Framework support for Exynos5260 SoC. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-exynos5410.c +0 -2
@@ -11,8 +11,6 @@#include <dt-bindings/clock/exynos5410.h> -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-exynos5420.c +1 -2
@@ -11,8 +11,7 @@*/ #include <dt-bindings/clock/exynos5420.h> -#include <linux/clk.h> -#include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-exynos5433.c +0 -2
@@ -9,8 +9,6 @@* Common Clock Framework support for Exynos5443 SoC. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h>
drivers/clk/samsung/clk-exynos5440.c +0 -2
@@ -10,8 +10,6 @@*/ #include <dt-bindings/clock/exynos5440.h> -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-exynos7.c +0 -2
@@ -8,8 +8,6 @@* */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h>
drivers/clk/samsung/clk-pll.c +2 -0
@@ -12,6 +12,8 @@#include <linux/errno.h> #include <linux/hrtimer.h> #include <linux/delay.h> +#include <linux/slab.h> +#include <linux/clkdev.h> #include "clk.h" #include "clk-pll.h"
drivers/clk/samsung/clk-s3c2410.c +0 -2
@@ -8,8 +8,6 @@* Common Clock Framework support for S3C2410 and following SoCs. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-s3c2412.c +0 -2
@@ -8,8 +8,6 @@* Common Clock Framework support for S3C2412 and S3C2413. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-s3c2443.c +0 -2
@@ -8,8 +8,6 @@* Common Clock Framework support for S3C2443 and following SoCs. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-s3c64xx.c +0 -2
@@ -8,8 +8,6 @@* Common Clock Framework support for all S3C64xx SoCs. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk-s5pv210.c +0 -2
@@ -11,8 +11,6 @@* Common Clock Framework support for all S5PC110/S5PV210 SoCs. */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/samsung/clk.c +4 -0
@@ -11,6 +11,10 @@* clock framework for Samsung platforms. */ +#include <linux/slab.h> +#include <linux/clkdev.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/of_address.h> #include <linux/syscore_ops.h>
drivers/clk/samsung/clk.h +2 -1
@@ -13,10 +13,11 @@#ifndef __SAMSUNG_CLK_H#define __SAMSUNG_CLK_H -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include "clk-pll.h" +struct clk ; +/** * struct samsung_clk_provider: information about clock provider * @reg_base: virtual address for the register base.
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 22/45] clk: samsung: Properly include clk.h and clkdev.h
W dniu 11.07.2015 o 08:33, Stephen Boyd pisze:
Quoted 24 lines
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Only includeclk.hin files that are using it. Theclkdev.hheader isn't always used either, so remove it and add inslab.hwhere files were relying on it to include slab for them.Cc Chanwoo Choi <[email protected]>Cc Sylwester Nawrocki <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- drivers/clk/samsung/clk-cpu.c | 3 +++ drivers/clk/samsung/clk-exynos-audss.c | 3 ++- drivers/clk/samsung/clk-exynos-clkout.c | 2 +- drivers/clk/samsung/clk-exynos3250.c | 2 -- drivers/clk/samsung/clk-exynos4.c | 2 +- drivers/clk/samsung/clk-exynos4415.c | 2 -- drivers/clk/samsung/clk-exynos5250.c | 2 -- drivers/clk/samsung/clk-exynos5260.c | 2 -- drivers/clk/samsung/clk-exynos5410.c | 2 -- drivers/clk/samsung/clk-exynos5420.c | 3 +-- drivers/clk/samsung/clk-exynos5433.c | 2 -- drivers/clk/samsung/clk-exynos5440.c | 2 -- drivers/clk/samsung/clk-exynos7.c | 2 -- drivers/clk/samsung/clk-pll.c | 2 ++
Quoted 8 lines
drivers/clk/samsung/clk-s3c2410.c | 2 -- drivers/clk/samsung/clk-s3c2412.c | 2 -- drivers/clk/samsung/clk-s3c2443.c | 2 -- drivers/clk/samsung/clk-s3c64xx.c | 2 -- drivers/clk/samsung/clk-s5pv210.c | 2 -- drivers/clk/samsung/clk.c | 4 ++++ drivers/clk/samsung/clk.h | 3 ++- 21 files changed, 16 insertions(+), 32 deletions(-)
One comment at the end.
(...)
Quoted 20 lines
drivers/clk/samsung/clk.c +4
-0@@ -11,6 +11,10 @@* clock framework for Samsung platforms. */ +#include <linux/slab.h> +#include <linux/clkdev.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/of_address.h> #include <linux/syscore_ops.h> drivers/clk/samsung/clk.h +0
-0
drivers/clk/samsung/clk.h line 20
Quoted 9 lines
drivers/clk/samsung/clk.h +2
-1@@ -13,10 +13,11 @@#ifndef __SAMSUNG_CLK_H#define __SAMSUNG_CLK_H -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include "clk-pll.h" +struct clk ; +
Hmmm... why? Including clk-provider (which declares struct clk in your last patch) is not sufficient?
Best regards,
Krzysztof
Quoted 4 lines
drivers/clk/samsung/clk.h +0
-0/** * struct samsung_clk_provider: information about clock provider * @reg_base: virtual address for the register base.
Re: [PATCH 22/45] clk: samsung: Properly include clk.h and clkdev.h
Quoted 25 lines · Krzysztof Kozlowski
W dniu 11.07.2015 o 08:33, Stephen Boyd pisze:
Quoted 23 lines
drivers/clk/samsung/clk.c +4
-0@@ -11,6 +11,10 @@* clock framework for Samsung platforms. */ +#include <linux/slab.h> +#include <linux/clkdev.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/of_address.h> #include <linux/syscore_ops.h> drivers/clk/samsung/clk.h +0
-0@@ -13,10 +13,11 @@#ifndef __SAMSUNG_CLK_H#define __SAMSUNG_CLK_H
Quoted 9 lines
drivers/clk/samsung/clk.h line 20
Quoted 6 lines
drivers/clk/samsung/clk.h +2
-1-#include <linux/clkdev.h> #include <linux/clk-provider.h> #include "clk-pll.h" +struct clk ; +Hmmm... why? Including clk-provider (which declares struct clk in your last patch) is not sufficient?
I hope to eventually remove the forward declaration of struct clk in clk-provider.h too. That will take some more time though. I can leave this part out of the patch if you like and add it back when that work is done, it doesn't matter to me.
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 22/45] clk: samsung: Properly include clk.h and clkdev.h
Quoted 32 lines · Stephen Boyd
Quoted 21 lines · Krzysztof Kozlowski
W dniu 11.07.2015 o 08:33, Stephen Boyd pisze:
Quoted 19 lines
drivers/clk/samsung/clk.c +3
-0@@ -11,6 +11,10 @@* clock framework for Samsung platforms. */ +#include <linux/slab.h> +#include <linux/clkdev.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> #include <linux/of_address.h> #include <linux/syscore_ops.h> diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.hindex
b775fc29caa5..aa872d2c5105100644drivers/clk/samsung/clk.h +0
-0@@ -13,10 +13,11 @@#ifndef __SAMSUNG_CLK_HQuoted 9 lines
drivers/clk/samsung/clk.h line 20
Quoted 6 lines
drivers/clk/samsung/clk.h +1
-0#define __SAMSUNG_CLK_H -#include <linux/clkdev.h>#include <linux/clk-provider.h> #include "clk-pll.h" +struct clk; +Hmmm... why? Including clk-provider (which declares struct clk in your last patch) is not sufficient?
Quoted 4 lines
I hope to eventually remove the forward declaration of struct clk in
clk-provider.htoo. That will take some more time though. I can leave this part out of the patch if you like and add it back when that work is done, it doesn't matter to me.
Thanks for explanation, it's fine as it is.
Best regards,
Krzysztof
Re: [PATCH 22/45] clk: samsung: Properly include clk.h and clkdev.h
In reply to Stephen BoydQuoted 1 line · Stephen Boyd
[...]
Quoted 4 lines
I hope to eventually remove the forward declaration of struct clk in
clk-provider.htoo. That will take some more time though. I can leave this part out of the patch if you like and add it back when that work is done, it doesn't matter to me.
The current version of this patch seems to break at least one of the linux-next builds:
Bisecting: 0 revisions left to test after this (roughly 0 steps) [41608067f4b3912d03eeb2ad4f9db8cbe4d969ca] clk: samsung: Properly include clk.h and clkdev.h
running ./x
#
# configuration written to .config # drivers/clk/samsung/clk-s3c2410-dclk.c: In function 's3c24xx_register_clkout': drivers/clk/samsung/clk-s3c2410-dclk.c:99:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration] drivers/clk/samsung/clk-s3c2410-dclk.c:99:9: warning: assignment makes pointer from integer without a cast [enabled by default] drivers/clk/samsung/clk-s3c2410-dclk.c: In function 's3c24xx_dclk_probe': drivers/clk/samsung/clk-s3c2410-dclk.c:312:2: error: implicit declaration of function 'clk_register_clkdev' [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors make[2]: *** [drivers/clk/samsung/clk-s3c2410-dclk.o] Error 1 make[1]: *** [drivers/clk/samsung] Error 2 make: *** [drivers/clk/] Error 2 41608067f4b3912d03eeb2ad4f9db8cbe4d969ca is the first bad commit commit 41608067f4b3912d03eeb2ad4f9db8cbe4d969ca Author: Stephen Boyd <[email protected]> Date: Fri Jun 19 15:00:46 2015 -0700
clk: samsung: Properly include clk.h and clkdev.h
http://kisskb.ellerman.id.au/kisskb/buildresult/12465308/
Paul.
--
Quoted 10 lines
--
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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
PATCH 23/45 clk: sirf: Properly include clk.h
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Move the include of clk.h into clk-common.c because that's the only file that's really using clk.h, even if it's included into the atlas6 and prima2 files.
--- drivers/clk/sirf/clk-atlas6.c | 1 - drivers/clk/sirf/clk-common.c | 2 ++ drivers/clk/sirf/clk-prima2.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-)
drivers/clk/sirf/clk-atlas6.c +0 -1
@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/bitops.h> #include <linux/io.h> -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of_address.h>
drivers/clk/sirf/clk-common.c +2 -0
@@ -7,6 +7,8 @@* Licensed under GPLv2 or later. */ +#include <linux/clk.h> +#define KHZ 1000#define MHZ (KHZ * KHZ)
drivers/clk/sirf/clk-prima2.c +0 -1
@@ -10,7 +10,6 @@#include <linux/module.h> #include <linux/bitops.h> #include <linux/io.h> -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/of_address.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 24/45 clk: socfpga: Remove clk.h and clkdev.h includes
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver. The clkdev.h include isn't used either, remove it and add in slab.h to make sure things keep compiling.
--- drivers/clk/socfpga/clk-gate-a10.c | 1 + drivers/clk/socfpga/clk-gate.c | 3 +-- drivers/clk/socfpga/clk-periph-a10.c | 1 + drivers/clk/socfpga/clk-periph.c | 3 +-- drivers/clk/socfpga/clk-pll-a10.c | 1 + drivers/clk/socfpga/clk-pll.c | 3 +-- drivers/clk/socfpga/clk.h | 1 - 7 files changed, 6 insertions(+), 7 deletions(-)
drivers/clk/socfpga/clk-gate-a10.c +1 -0
@@ -13,6 +13,7 @@* You should have received a copy of the GNU General Public License along with * this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/slab.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/mfd/syscon.h>
drivers/clk/socfpga/clk-gate.c +1 -2
@@ -15,8 +15,7 @@* Based from clk-highbank.c * */ -#include <linux/clk.h> -#include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/mfd/syscon.h>
drivers/clk/socfpga/clk-periph-a10.c +1 -0
@@ -13,6 +13,7 @@* You should have received a copy of the GNU General Public License along with * this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/slab.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/of.h>
drivers/clk/socfpga/clk-periph.c +1 -2
@@ -15,8 +15,7 @@* Based from clk-highbank.c * */ -#include <linux/clk.h> -#include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/of.h>
drivers/clk/socfpga/clk-pll-a10.c +1 -0
@@ -13,6 +13,7 @@* You should have received a copy of the GNU General Public License along with * this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/slab.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/of.h>
drivers/clk/socfpga/clk-pll.c +1 -2
@@ -15,8 +15,7 @@* Based from clk-highbank.c * */ -#include <linux/clk.h> -#include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/of.h>
drivers/clk/socfpga/clk.h +0 -1
@@ -18,7 +18,6 @@#define __SOCFPGA_CLK_H#include <linux/clk-provider.h> -#include <linux/clkdev.h> /* Clock Manager offsets */ #define CLKMGR_CTRL 0x0
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 24/45] clk: socfpga: Remove clk.h and clkdev.h includes
Quoted 7 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Remove the include here because this is a provider driver. Theclkdev.hinclude isn't used either, remove it and add inslab.hto make sure things keep compiling.Cc Dinh Nguyen <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 10 lines
--- drivers/clk/socfpga/clk-gate-a10.c | 1 + drivers/clk/socfpga/clk-gate.c | 3 +-- drivers/clk/socfpga/clk-periph-a10.c | 1 + drivers/clk/socfpga/clk-periph.c | 3 +-- drivers/clk/socfpga/clk-pll-a10.c | 1 + drivers/clk/socfpga/clk-pll.c | 3 +-- drivers/clk/socfpga/clk.h | 1 - 7 files changed, 6 insertions(+), 7 deletions(-)
Thanks,
Dinh
PATCH 25/45 clk: socfpga: Remove clk.h include
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver.
--- drivers/clk/spear/spear1310_clock.c | 1 - drivers/clk/spear/spear1340_clock.c | 1 - drivers/clk/spear/spear3xx_clock.c | 1 - drivers/clk/spear/spear6xx_clock.c | 1 - 4 files changed, 4 deletions(-)
drivers/clk/spear/spear1310_clock.c +0 -1
@@ -11,7 +11,6 @@* warranty of any kind, whether express or implied. */ -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/err.h> #include <linux/io.h>
drivers/clk/spear/spear1340_clock.c +0 -1
@@ -11,7 +11,6 @@* warranty of any kind, whether express or implied. */ -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/err.h> #include <linux/io.h>
drivers/clk/spear/spear3xx_clock.c +0 -1
@@ -9,7 +9,6 @@* warranty of any kind, whether express or implied. */ -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/err.h> #include <linux/io.h>
drivers/clk/spear/spear6xx_clock.c +0 -1
@@ -9,7 +9,6 @@* warranty of any kind, whether express or implied. */ -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/io.h> #include <linux/spinlock_types.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 25/45] clk: socfpga: Remove clk.h include
Quoted 4 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Remove the include here because this is a provider driver.
Quoted 8 lines
Cc Viresh Kumar <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- drivers/clk/spear/spear1310_clock.c | 1 - drivers/clk/spear/spear1340_clock.c | 1 - drivers/clk/spear/spear3xx_clock.c | 1 - drivers/clk/spear/spear6xx_clock.c | 1 - 4 files changed, 4 deletions(-)
I hope you have compiled it :)
Signature · 1 line
viresh
PATCH 26/45 clk: tegra: Properly include clk.h
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Only include clk.h in files that are using it. Also add in a clkdev.h include that was missing in a file using clkdev APIs.
--- drivers/clk/tegra/clk-divider.c | 1 - drivers/clk/tegra/clk-periph-gate.c | 1 - drivers/clk/tegra/clk-periph.c | 1 - drivers/clk/tegra/clk-pll-out.c | 1 - drivers/clk/tegra/clk-pll.c | 2 +- drivers/clk/tegra/clk-super.c | 1 - drivers/clk/tegra/clk-tegra-audio.c | 1 - drivers/clk/tegra/clk-tegra-fixed.c | 1 - drivers/clk/tegra/clk-tegra-periph.c | 1 - drivers/clk/tegra/clk-tegra-pmc.c | 1 - drivers/clk/tegra/clk-tegra-super-gen4.c | 1 - drivers/clk/tegra/clk-tegra114.c | 2 -- drivers/clk/tegra/clk-tegra124.c | 1 - drivers/clk/tegra/clk-tegra20.c | 1 - drivers/clk/tegra/clk-tegra30.c | 1 - drivers/clk/tegra/clk.c | 1 + include/linux/clk/tegra.h | 3 ++- 17 files changed, 4 insertions(+), 17 deletions(-)
drivers/clk/tegra/clk-divider.c +0 -1
@@ -19,7 +19,6 @@#include <linux/err.h> #include <linux/slab.h> #include <linux/clk-provider.h> -#include <linux/clk.h> #include "clk.h"
drivers/clk/tegra/clk-periph-gate.c +0 -1
@@ -14,7 +14,6 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/slab.h> #include <linux/io.h>
drivers/clk/tegra/clk-periph.c +0 -1
@@ -14,7 +14,6 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/export.h> #include <linux/slab.h>
drivers/clk/tegra/clk-pll-out.c +0 -1
@@ -20,7 +20,6 @@#include <linux/delay.h> #include <linux/slab.h> #include <linux/clk-provider.h> -#include <linux/clk.h> #include "clk.h"
drivers/clk/tegra/clk-pll.c +1 -1
@@ -18,8 +18,8 @@#include <linux/io.h> #include <linux/delay.h> #include <linux/err.h> -#include <linux/clk-provider.h> #include <linux/clk.h> +#include <linux/clk-provider.h> #include "clk.h"
drivers/clk/tegra/clk-super.c +0 -1
@@ -20,7 +20,6 @@#include <linux/err.h> #include <linux/slab.h> #include <linux/clk-provider.h> -#include <linux/clk.h> #include "clk.h"
drivers/clk/tegra/clk-tegra-audio.c +0 -1
@@ -15,7 +15,6 @@*/ #include <linux/io.h> -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/tegra/clk-tegra-fixed.c +0 -1
@@ -15,7 +15,6 @@*/ #include <linux/io.h> -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/tegra/clk-tegra-periph.c +0 -1
@@ -15,7 +15,6 @@*/ #include <linux/io.h> -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/of.h>
drivers/clk/tegra/clk-tegra-pmc.c +0 -1
@@ -15,7 +15,6 @@*/ #include <linux/io.h> -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/of.h>
drivers/clk/tegra/clk-tegra-super-gen4.c +0 -1
@@ -15,7 +15,6 @@*/ #include <linux/io.h> -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
drivers/clk/tegra/clk-tegra114.c +0 -2
@@ -15,9 +15,7 @@*/ #include <linux/io.h> -#include <linux/clk.h> #include <linux/clk-provider.h> -#include <linux/clkdev.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/delay.h>
drivers/clk/tegra/clk-tegra124.c +0 -1
@@ -15,7 +15,6 @@*/ #include <linux/io.h> -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/of.h>
drivers/clk/tegra/clk-tegra20.c +0 -1
@@ -15,7 +15,6 @@*/ #include <linux/io.h> -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/of.h>
drivers/clk/tegra/clk-tegra30.c +0 -1
@@ -16,7 +16,6 @@#include <linux/io.h> #include <linux/delay.h> -#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/of.h>
drivers/clk/tegra/clk.c +1 -0
@@ -14,6 +14,7 @@* along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/clkdev.h> #include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of.h>
include/linux/clk/tegra.h +2 -1
@@ -17,7 +17,8 @@#ifndef __LINUX_CLK_TEGRA_H_#define __LINUX_CLK_TEGRA_H_ -#include <linux/clk.h> +#include <linux/types.h> +#include <linux/bug.h> /* * Tegra CPU clock and reset control ops
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 27/45 clk: ux500: Remove clk.h and clkdev.h includes
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver. Also remove clkdev.h in files that aren't using it.
--- drivers/clk/ux500/abx500-clk.c | 1 - drivers/clk/ux500/clk.h | 3 ++- drivers/clk/ux500/u8500_clk.c | 1 - drivers/clk/ux500/u8500_of_clk.c | 2 -- drivers/clk/ux500/u8540_clk.c | 1 - drivers/clk/ux500/u9540_clk.c | 2 -- 6 files changed, 2 insertions(+), 8 deletions(-)
drivers/clk/ux500/abx500-clk.c +0 -1
@@ -13,7 +13,6 @@#include <linux/platform_device.h> #include <linux/mfd/abx500/ab8500.h> #include <linux/mfd/abx500/ab8500-sysctrl.h> -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h>
drivers/clk/ux500/clk.h +2 -1
@@ -10,10 +10,11 @@#ifndef __UX500_CLK_H#define __UX500_CLK_H -#include <linux/clk.h> #include <linux/device.h> #include <linux/types.h> +struct clk ; + struct clk *clk_reg_prcc_pclk(const char *name, const char *parent_name, resource_size_t phy_base,
drivers/clk/ux500/u8500_clk.c +0 -1
@@ -7,7 +7,6 @@* License terms: GNU General Public License (GPL) version 2 */ -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h>
drivers/clk/ux500/u8500_of_clk.c +0 -2
@@ -8,8 +8,6 @@*/ #include <linux/of.h> -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h> #include <linux/platform_data/clk-ux500.h>
drivers/clk/ux500/u8540_clk.c +0 -1
@@ -7,7 +7,6 @@* License terms: GNU General Public License (GPL) version 2 */ -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h>
drivers/clk/ux500/u9540_clk.c +0 -2
@@ -7,8 +7,6 @@* License terms: GNU General Public License (GPL) version 2 */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h> #include <linux/platform_data/clk-ux500.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 27/45] clk: ux500: Remove clk.h and clkdev.h includes
Quoted 7 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Remove the include here because this is a provider driver. Also removeclkdev.hin files that aren't using it.Cc Linus Walleij <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Ulf Hansson should also look at this preferably.
Yours,
Linus Walleij
Re: [PATCH 27/45] clk: ux500: Remove clk.h and clkdev.h includes
In reply to Stephen BoydQuoted 7 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Remove the include here because this is a provider driver. Also removeclkdev.hin files that aren't using it.Cc Linus Walleij <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Kind regards
Uffe
Quoted 97 lines
--- drivers/clk/ux500/abx500-clk.c | 1 - drivers/clk/ux500/clk.h | 3 ++- drivers/clk/ux500/u8500_clk.c | 1 - drivers/clk/ux500/u8500_of_clk.c | 2 -- drivers/clk/ux500/u8540_clk.c | 1 - drivers/clk/ux500/u9540_clk.c | 2 -- 6 files changed, 2 insertions(+), 8 deletions(-)drivers/clk/ux500/abx500-clk.c +0
-1@@ -13,7 +13,6 @@#include <linux/platform_device.h> #include <linux/mfd/abx500/ab8500.h> #include <linux/mfd/abx500/ab8500-sysctrl.h> -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h> drivers/clk/ux500/clk.h +2
-1@@ -10,10 +10,11 @@#ifndef __UX500_CLK_H#define __UX500_CLK_H -#include <linux/clk.h> #include <linux/device.h> #include <linux/types.h> +struct clk ; + struct clk *clk_reg_prcc_pclk(const char *name, const char *parent_name, resource_size_t phy_base,drivers/clk/ux500/u8500_clk.c +0
-1@@ -7,7 +7,6 @@* License terms: GNU General Public License (GPL) version 2 */ -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h> drivers/clk/ux500/u8500_of_clk.c +0
-2@@ -8,8 +8,6 @@*/ #include <linux/of.h> -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h> #include <linux/platform_data/clk-ux500.h> drivers/clk/ux500/u8540_clk.c +0
-1@@ -7,7 +7,6 @@* License terms: GNU General Public License (GPL) version 2 */ -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h> drivers/clk/ux500/u9540_clk.c +0
-3@@ -7,8 +7,6 @@* License terms: GNU General Public License (GPL) version 2 */ -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/clk-provider.h> #include <linux/mfd/dbx500-prcmu.h> #include <linux/platform_data/clk-ux500.h> --The Qualcomm Innovation Center, Inc. is a member of the 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
PATCH 28/45 clk: versatile: Remove clk.h and clkdev.h includes
In reply to Stephen BoydClock provider drivers generally shouldn't include clk.h because it's the consumer API. Remove the include here because this is a provider driver. Also remove clkdev.h in files that aren't using it and replace them with slab.h in files that were relying on the implicit include of slab.h in clkdev.h.
--- drivers/clk/versatile/clk-icst.c | 5 +++-- drivers/clk/versatile/clk-impd1.c | 1 - drivers/clk/versatile/clk-realview.c | 1 - drivers/clk/versatile/clk-sp810.c | 3 ++- drivers/clk/versatile/clk-versatile.c | 2 -- 5 files changed, 5 insertions(+), 7 deletions(-)
drivers/clk/versatile/clk-icst.c +3 -2
@@ -13,8 +13,9 @@* ICST clock code from the ARM tree should probably be merged into this * file. */ -#include <linux/clk.h> -#include <linux/clkdev.h> +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/export.h> #include <linux/err.h> #include <linux/clk-provider.h> #include <linux/io.h>
drivers/clk/versatile/clk-impd1.c +0 -1
@@ -7,7 +7,6 @@* published by the Free Software Foundation. */ #include <linux/clk-provider.h> -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/err.h> #include <linux/io.h>
drivers/clk/versatile/clk-realview.c +0 -1
@@ -6,7 +6,6 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <linux/clk.h> #include <linux/clkdev.h> #include <linux/err.h> #include <linux/io.h>
drivers/clk/versatile/clk-sp810.c +2 -1
@@ -12,7 +12,8 @@*/ #include <linux/amba/sp810.h> -#include <linux/clkdev.h> +#include <linux/slab.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/err.h> #include <linux/of.h>
drivers/clk/versatile/clk-versatile.c +0 -2
@@ -8,8 +8,6 @@* published by the Free Software Foundation. */ #include <linux/clk-provider.h> -#include <linux/clk.h> -#include <linux/clkdev.h> #include <linux/err.h> #include <linux/of.h> #include <linux/of_address.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 28/45] clk: versatile: Remove clk.h and clkdev.h includes
Quoted 8 lines · Stephen Boyd
Clock provider drivers generally shouldn't include
clk.hbecause it's the consumer API. Remove the include here because this is a provider driver. Also removeclkdev.hin files that aren't using it and replace them withslab.hin files that were relying on the implicit include ofslab.hinclkdev.h.Cc Linus Walleij <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Yours,
Linus Walleij
PATCH 29/45 clk: bcm: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/bcm/clk-kona.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/bcm/clk-kona.c +1 -0
@@ -16,6 +16,7 @@#include <linux/delay.h> #include <linux/kernel.h> +#include <linux/clk.h> /* * "Policies" affect the frequencies of bus clocks provided by a
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 29/45] clk: bcm: Include clk.h
Quoted 5 lines · Stephen Boyd
This clock provider uses the consumer API, so include
clk.hexplicitly.Cc Alex Elder <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 17 lines
--- drivers/clk/bcm/clk-kona.c | 1 + 1 file changed, 1 insertion(+)drivers/clk/bcm/clk-kona.c +1
-0@@ -16,6 +16,7 @@#include <linux/delay.h> #include <linux/kernel.h> +#include <linux/clk.h> /* * "Policies" affect the frequencies of bus clocks provided by a
PATCH 30/45 clk: highbank: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/clk-highbank.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk-highbank.c +1 -0
@@ -17,6 +17,7 @@#include <linux/kernel.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/of.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 31/45 clk: qcom: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/qcom/mmcc-msm8960.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/mmcc-msm8960.c +1 -0
@@ -19,6 +19,7 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/regmap.h> #include <linux/reset-controller.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 32/45 clk: st: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/st/clk-flexgen.c | 1 + drivers/clk/st/clkgen-fsyn.c | 1 + drivers/clk/st/clkgen-mux.c | 1 + drivers/clk/st/clkgen-pll.c | 1 + 4 files changed, 4 insertions(+)
drivers/clk/st/clk-flexgen.c +1 -0
@@ -5,6 +5,7 @@* Author: Maxime Coquelin <[email protected]> for ST-Microelectronics. * License terms: GNU General Public License (GPL), version 2 */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/module.h> #include <linux/slab.h>
drivers/clk/st/clkgen-fsyn.c +1 -0
@@ -15,6 +15,7 @@#include <linux/slab.h> #include <linux/of_address.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include "clkgen.h"
drivers/clk/st/clkgen-mux.c +1 -0
@@ -15,6 +15,7 @@#include <linux/slab.h> #include <linux/of_address.h> +#include <linux/clk.h> #include <linux/clk-provider.h> static DEFINE_SPINLOCK (clkgena_divmux_lock);
drivers/clk/st/clkgen-pll.c +1 -0
@@ -16,6 +16,7 @@#include <linux/slab.h> #include <linux/of_address.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include "clkgen.h"
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 33/45 clk: sunxi: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- 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(-)
drivers/clk/sunxi/clk-mod0.c +2 -1
@@ -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> #include <linux/of_address.h> #include <linux/platform_device.h>
drivers/clk/sunxi/clk-sun8i-mbus.c +1 -1
@@ -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"
drivers/clk/sunxi/clk-sun9i-core.c +1 -1
@@ -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>
drivers/clk/sunxi/clk-sun9i-mmc.c +2 -1
@@ -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> #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h>
drivers/clk/sunxi/clk-sunxi.c +2 -0
@@ -14,6 +14,8 @@* GNU General Public License for more details. */ +#include <linux/slab.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/of.h>
drivers/clk/sunxi/clk-usb.c +2 -1
@@ -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> #include <linux/of.h> #include <linux/of_address.h> #include <linux/reset-controller.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 33/45] clk: sunxi: Include clk.h
Hi Stephen,
Quoted 20 lines · Stephen Boyd
This clock provider uses the consumer API, so include
clk.hexplicitly.Cc Chen-Yu Tsai <[email protected]>Cc Maxime Ripard <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- 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(-)drivers/clk/sunxi/clk-mod0.c +0
-0
drivers/clk/sunxi/clk-mod0.c line 19
Quoted 7 lines
drivers/clk/sunxi/clk-mod0.c +2
-1@@ -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?
Thanks,
Maxime
Signature · 3 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
Re: [PATCH 33/45] clk: sunxi: Include clk.h
Quoted 26 lines · Maxime Ripard
Hi Stephen,
Quoted 23 lines · Stephen Boyd
This clock provider uses the consumer API, so include
clk.hexplicitly.Cc Chen-Yu Tsai <[email protected]>Cc Maxime Ripard <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- 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(-)drivers/clk/sunxi/clk-mod0.c +0
-0@@ -14,8 +14,9 @@* GNU General Public License for more details. */
Quoted 8 lines
drivers/clk/sunxi/clk-mod0.c line 19
Quoted 4 lines
drivers/clk/sunxi/clk-mod0.c +2
-1+#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 <[email protected]>
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.
--- 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(-)
drivers/clk/sunxi/clk-mod0.c +2 -1
@@ -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"
drivers/clk/sunxi/clk-sun8i-mbus.c +1 -1
@@ -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"
drivers/clk/sunxi/clk-sun9i-core.c +1 -1
@@ -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>
drivers/clk/sunxi/clk-sun9i-mmc.c +2 -1
@@ -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
drivers/clk/sunxi/clk-sunxi.c +2 -0
@@ -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>
drivers/clk/sunxi/clk-usb.c +2 -1
@@ -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>
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Maxime Ripard
Acked-byRe: [PATCH 33/45] clk: sunxi: Include clk.h
Quoted 42 lines · Stephen Boyd
Quoted 31 lines · Maxime Ripard
Hi Stephen,
Quoted 20 lines · Stephen Boyd
This clock provider uses the consumer API, so include
clk.hexplicitly.Cc Chen-Yu Tsai <[email protected]>Cc Maxime Ripard <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- 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(-)drivers/clk/sunxi/clk-mod0.c +0
-0drivers/clk/sunxi/clk-mod0.c line 18
Quoted 6 lines
drivers/clk/sunxi/clk-mod0.c +2
-1@@ -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;)Quoted 2 lines
Could you sort the headers alphabetically please?
Sure.
---8<----
From: Stephen Boyd <[email protected]>
Subject: [PATCH] clk: sunxi: Includeclk.hand remove unusedclkdev.hincludes
Quoted 8 lines
This clock provider uses the consumer API, so include
clk.hexplicitly. Also removeclkdev.hin files that aren't using it and includeslab.hwhenclkdev.hwas being used to implicitly include it.Cc Chen-Yu Tsai <[email protected]>Cc Maxime Ripard <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Perfect, thanks!
Maxime
Signature · 3 lines
Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 34/45 clk: ti: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/ti/apll.c | 1 + drivers/clk/ti/clk-33xx.c | 1 + drivers/clk/ti/clk-3xxx-legacy.c | 1 + drivers/clk/ti/clk-3xxx.c | 1 + drivers/clk/ti/clk-43xx.c | 1 + drivers/clk/ti/clk-dra7-atl.c | 1 + drivers/clk/ti/clk.c | 1 + drivers/clk/ti/clockdomain.c | 1 + drivers/clk/ti/dpll.c | 1 + drivers/clk/ti/fapll.c | 1 + 10 files changed, 10 insertions(+)
drivers/clk/ti/apll.c +1 -0
@@ -15,6 +15,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/module.h> #include <linux/slab.h>
drivers/clk/ti/clk-33xx.c +1 -0
@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/list.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clk/ti.h>
drivers/clk/ti/clk-3xxx-legacy.c +1 -0
@@ -15,6 +15,7 @@*/ #include <linux/kernel.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clk/ti.h>
drivers/clk/ti/clk-3xxx.c +1 -0
@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/list.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clk/ti.h>
drivers/clk/ti/clk-43xx.c +1 -0
@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/list.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clk/ti.h>
drivers/clk/ti/clk-dra7-atl.c +1 -0
@@ -16,6 +16,7 @@*/ #include <linux/module.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/slab.h> #include <linux/io.h>
drivers/clk/ti/clk.c +1 -0
@@ -15,6 +15,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/clk/ti.h>
drivers/clk/ti/clockdomain.c +1 -0
@@ -15,6 +15,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/slab.h> #include <linux/of.h>
drivers/clk/ti/dpll.c +1 -0
@@ -15,6 +15,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/slab.h> #include <linux/err.h>
drivers/clk/ti/fapll.c +1 -0
@@ -9,6 +9,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/err.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 34/45] clk: ti: Include clk.h
Quoted 5 lines · Stephen Boyd
This clock provider uses the consumer API, so include
clk.hexplicitly.Cc Tero Kristo <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 134 lines
--- drivers/clk/ti/apll.c | 1 + drivers/clk/ti/clk-33xx.c | 1 + drivers/clk/ti/clk-3xxx-legacy.c | 1 + drivers/clk/ti/clk-3xxx.c | 1 + drivers/clk/ti/clk-43xx.c | 1 + drivers/clk/ti/clk-dra7-atl.c | 1 + drivers/clk/ti/clk.c | 1 + drivers/clk/ti/clockdomain.c | 1 + drivers/clk/ti/dpll.c | 1 + drivers/clk/ti/fapll.c | 1 + 10 files changed, 10 insertions(+)drivers/clk/ti/apll.c +1
-0@@ -15,6 +15,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/module.h> #include <linux/slab.h> drivers/clk/ti/clk-33xx.c +1
-0@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/list.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clk/ti.h> drivers/clk/ti/clk-3xxx-legacy.c +1
-0@@ -15,6 +15,7 @@*/ #include <linux/kernel.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clk/ti.h> drivers/clk/ti/clk-3xxx.c +1
-0@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/list.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clk/ti.h> drivers/clk/ti/clk-43xx.c +1
-0@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/list.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clk/ti.h> drivers/clk/ti/clk-dra7-atl.c +1
-0@@ -16,6 +16,7 @@*/ #include <linux/module.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/slab.h> #include <linux/io.h> drivers/clk/ti/clk.c +1
-0@@ -15,6 +15,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/clk/ti.h> drivers/clk/ti/clockdomain.c +1
-0@@ -15,6 +15,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/slab.h> #include <linux/of.h> drivers/clk/ti/dpll.c +1
-0@@ -15,6 +15,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/slab.h> #include <linux/err.h> drivers/clk/ti/fapll.c +1
-0@@ -9,6 +9,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/err.h>
PATCH 35/45 clk: zynq: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/zynq/clkc.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/zynq/clkc.c +1 -0
@@ -19,6 +19,7 @@*/ #include <linux/clk/zynq.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of.h> #include <linux/of_address.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 35/45] clk: zynq: Include clk.h
Quoted 5 lines · Stephen Boyd
This clock provider uses the consumer API, so include
clk.hexplicitly.Cc Sören Brinkmann <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Thanks,
Sören
PATCH 36/45 clk: Include clk.h in clk.c
In reply to Stephen BoydThis file implements the clk API and so it should include clk.h directly instead of indirectly including it through clk-provider.h.
--- drivers/clk/clk.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk.c +1 -0
@@ -9,6 +9,7 @@* Standard functionality for the common clock API. See Documentation/clk.txt */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clk/clk-conf.h> #include <linux/module.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 37/45 clk: cdce925: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/clk-cdce925.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk-cdce925.c +1 -0
@@ -10,6 +10,7 @@* Copyright (C) 2014, Topic Embedded Products * Licenced under GPL */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/module.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 38/45 clk: moxart: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/clk-moxart.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk-moxart.c +1 -0
@@ -10,6 +10,7 @@* warranty of any kind, whether express or implied. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/io.h> #include <linux/of_address.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 39/45 clk: si570: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/clk-si570.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/clk-si570.c +1 -0
@@ -19,6 +19,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/delay.h> #include <linux/module.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 39/45] clk: si570: Include clk.h
Quoted 6 lines · Stephen Boyd
This clock provider uses the consumer API, so include
clk.hexplicitly.Cc Guenter Roeck <[email protected]>Cc Soren Brinkmann <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Thanks,
Sören
PATCH 40/45 clk: ingenic: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/ingenic/cgu.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/ingenic/cgu.c +1 -0
@@ -16,6 +16,7 @@*/ #include <linux/bitops.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> #include <linux/delay.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 41/45 clk: pistachio: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/pistachio/clk.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/pistachio/clk.c +1 -0
@@ -6,6 +6,7 @@* version 2, as published by the Free Software Foundation. */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/kernel.h> #include <linux/of.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 42/45 clk: samsung: s5pv210-audss: Include clk.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly.
--- drivers/clk/samsung/clk-s5pv210-audss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/samsung/clk-s5pv210-audss.c +1 -1
@@ -13,8 +13,8 @@* Driver for Audio Subsystem Clock Controller of S5PV210-compatible SoCs. */ -#include <linux/clkdev.h> #include <linux/io.h> +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/of_address.h> #include <linux/syscore_ops.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 43/45 clk: ti: Switch clk-provider.h include to clk.h
In reply to Stephen BoydThis file isn't a clock provider but uses the consumer API, so include clk.h instead of clk-provider.h.
--- drivers/clk/ti/clk-2xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ti/clk-2xxx.c +1 -1
@@ -16,7 +16,7 @@#include <linux/kernel.h> #include <linux/list.h> -#include <linux/clk-provider.h> +#include <linux/clk.h> #include <linux/clk/ti.h> static struct ti_dt_clk omap2xxx_clks[] = {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 43/45] clk: ti: Switch clk-provider.h include to clk.h
Quoted 5 lines · Stephen Boyd
This file isn't a clock provider but uses the consumer API, so include
clk.hinstead ofclk-provider.h.Cc Tero Kristo <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 18 lines
--- drivers/clk/ti/clk-2xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clk/ti/clk-2xxx.c +1
-1@@ -16,7 +16,7 @@#include <linux/kernel.h> #include <linux/list.h> -#include <linux/clk-provider.h> +#include <linux/clk.h> #include <linux/clk/ti.h> static struct ti_dt_clk omap2xxx_clks[] = {
PATCH 44/45 clk: at91: Include clk.h and slab.h
In reply to Stephen BoydThis clock provider uses the consumer API, so include clk.h explicitly. Also include slab.h instead of relying on clkdev.h for it.
--- drivers/clk/at91/clk-slow.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/at91/clk-slow.c +2 -0
@@ -10,8 +10,10 @@* */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/clk/at91_pmc.h> #include <linux/delay.h> #include <linux/of.h>
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 44/45] clk: at91: Include clk.h and slab.h
Quoted 6 lines · On Fri, 10 Jul 2015 16:33:42 -0700 Stephen Boyd <[email protected]> wrote:
This clock provider uses the consumer API, so include
clk.hexplicitly. Also includeslab.hinstead of relying onclkdev.hfor it.Cc Boris BREZILLON <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 19 lines
--- drivers/clk/at91/clk-slow.c | 2 ++ 1 file changed, 2 insertions(+)drivers/clk/at91/clk-slow.c +2
-0@@ -10,8 +10,10 @@* */ +#include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/clkdev.h> +#include <linux/slab.h> #include <linux/clk/at91_pmc.h> #include <linux/delay.h> #include <linux/of.h>
Signature · 3 lines
Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 45/45 clk: Remove clk.h from clk-provider.h
In reply to Stephen BoydRemove clk.h from clk-provider.h so that we can clearly split clk providers from clk consumers. This will allow us to quickly detect when clock providers are using the consumer APIs by looking at the includes.
--- include/linux/clk-provider.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/clk-provider.h +1 -1
@@ -11,7 +11,6 @@#ifndef __LINUX_CLK_PROVIDER_H#define __LINUX_CLK_PROVIDER_H -#include <linux/clk.h> #include <linux/io.h> #include <linux/of.h>
@@ -33,6 +32,7 @@#define CLK_GET_ACCURACY_NOCACHE BIT(8)/* do not use the cached clk accuracy */ #define CLK_RECALC_NEW_RATES BIT(9)/* recalc rates after notifications */ +struct clk ;struct clk_hw ;struct clk_core ;struct dentry ;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH 45/45] clk: Remove clk.h from clk-provider.h
Quoted 4 lines · Stephen Boyd
Remove
clk.hfromclk-provider.hso that we can clearly split clk providers from clk consumers. This will allow us to quickly detect when clock providers are using the consumer APIs by looking at the includes.
At least one build does not like this change:
running ./x
#
# configuration written to .config # drivers/clk/spear/spear3xx_clock.c: In function 'spear320_clk_init': drivers/clk/spear/spear3xx_clock.c:346:2: error: implicit declaration of function 'clk_set_parent' [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors make[2]: *** [drivers/clk/spear/spear3xx_clock.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [drivers/clk/spear] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [drivers/clk/] Error 2 3a2c322b68f8137be2f1f5788b13bfb9e0b937c3 is the first bad commit commit 3a2c322b68f8137be2f1f5788b13bfb9e0b937c3 Author: Stephen Boyd <[email protected]> Date: Mon Jun 22 17:13:49 2015 -0700
clk: Remove clk.h from clk-provider.h
http://kisskb.ellerman.id.au/kisskb/buildresult/12465390/
Paul.
--
Quoted 35 lines
Signed-off-by Stephen Boyd <[email protected]>--- include/linux/clk-provider.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/clk-provider.h +1
-2@@ -11,7 +11,6 @@#ifndef __LINUX_CLK_PROVIDER_H#define __LINUX_CLK_PROVIDER_H -#include <linux/clk.h> #include <linux/io.h> #include <linux/of.h> @@ -33,6 +32,7 @@#define CLK_GET_ACCURACY_NOCACHE BIT(8)/* do not use the cached clk accuracy */ #define CLK_RECALC_NEW_RATES BIT(9)/* recalc rates after notifications */ +struct clk ;struct clk_hw ;struct clk_core ;struct dentry ; --The Qualcomm Innovation Center, Inc. is a member of the 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/