* [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h>
@ 2015-06-23 13:09 Geert Uytterhoeven
2015-06-23 21:23 ` Stephen Boyd
2015-07-16 0:08 ` Stephen Boyd
0 siblings, 2 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2015-06-23 13:09 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd; +Cc: linux-clk, linux-sh, Geert Uytterhoeven
The CCF implementations for the various shmobile SoCs don't use clkdev
functionality, hence drop the inclusion of <linux/clkdev.h>.
Add the missing #include <linux/slab.h>, which was included implicitly
through <asm/clkdev.h> before.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/clk/shmobile/clk-div6.c | 2 +-
drivers/clk/shmobile/clk-r8a73a4.c | 2 +-
drivers/clk/shmobile/clk-r8a7740.c | 2 +-
drivers/clk/shmobile/clk-r8a7778.c | 2 +-
drivers/clk/shmobile/clk-r8a7779.c | 2 +-
drivers/clk/shmobile/clk-rcar-gen2.c | 4 +---
drivers/clk/shmobile/clk-sh73a0.c | 2 +-
7 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/clk/shmobile/clk-div6.c b/drivers/clk/shmobile/clk-div6.c
index 036a692c72195db9..6810bfb6ef5e09d1 100644
--- a/drivers/clk/shmobile/clk-div6.c
+++ b/drivers/clk/shmobile/clk-div6.c
@@ -11,12 +11,12 @@
*/
#include <linux/clk-provider.h>
-#include <linux/clkdev.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/of_address.h>
+#include <linux/slab.h>
#define CPG_DIV6_CKSTP BIT(8)
#define CPG_DIV6_DIV(d) ((d) & 0x3f)
diff --git a/drivers/clk/shmobile/clk-r8a73a4.c b/drivers/clk/shmobile/clk-r8a73a4.c
index 29b9a0b0012ad326..9326204bed9d6cb7 100644
--- a/drivers/clk/shmobile/clk-r8a73a4.c
+++ b/drivers/clk/shmobile/clk-r8a73a4.c
@@ -9,10 +9,10 @@
*/
#include <linux/clk-provider.h>
-#include <linux/clkdev.h>
#include <linux/clk/shmobile.h>
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/spinlock.h>
diff --git a/drivers/clk/shmobile/clk-r8a7740.c b/drivers/clk/shmobile/clk-r8a7740.c
index 1e2eaae21e01947b..1e6b1da580658f46 100644
--- a/drivers/clk/shmobile/clk-r8a7740.c
+++ b/drivers/clk/shmobile/clk-r8a7740.c
@@ -9,10 +9,10 @@
*/
#include <linux/clk-provider.h>
-#include <linux/clkdev.h>
#include <linux/clk/shmobile.h>
#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/spinlock.h>
diff --git a/drivers/clk/shmobile/clk-r8a7778.c b/drivers/clk/shmobile/clk-r8a7778.c
index fa45684e220c78ae..87c1d2f2fb57a46c 100644
--- a/drivers/clk/shmobile/clk-r8a7778.c
+++ b/drivers/clk/shmobile/clk-r8a7778.c
@@ -9,9 +9,9 @@
*/
#include <linux/clk-provider.h>
-#include <linux/clkdev.h>
#include <linux/clk/shmobile.h>
#include <linux/of_address.h>
+#include <linux/slab.h>
struct r8a7778_cpg {
struct clk_onecell_data data;
diff --git a/drivers/clk/shmobile/clk-r8a7779.c b/drivers/clk/shmobile/clk-r8a7779.c
index e42a63a2ad251de2..92275c5f2c60303e 100644
--- a/drivers/clk/shmobile/clk-r8a7779.c
+++ b/drivers/clk/shmobile/clk-r8a7779.c
@@ -11,12 +11,12 @@
*/
#include <linux/clk-provider.h>
-#include <linux/clkdev.h>
#include <linux/clk/shmobile.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/of_address.h>
+#include <linux/slab.h>
#include <linux/spinlock.h>
#include <dt-bindings/clock/r8a7779-clock.h>
diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c
index 9612e3145b7ea370..745496f7ee9c7402 100644
--- a/drivers/clk/shmobile/clk-rcar-gen2.c
+++ b/drivers/clk/shmobile/clk-rcar-gen2.c
@@ -11,15 +11,13 @@
*/
#include <linux/clk-provider.h>
-#include <linux/clkdev.h>
#include <linux/clk/shmobile.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/math64.h>
#include <linux/of.h>
#include <linux/of_address.h>
-#include <linux/pm_clock.h>
-#include <linux/pm_domain.h>
+#include <linux/slab.h>
#include <linux/spinlock.h>
struct rcar_gen2_cpg {
diff --git a/drivers/clk/shmobile/clk-sh73a0.c b/drivers/clk/shmobile/clk-sh73a0.c
index cd529cfe412f1d18..8966f8bbfd726e62 100644
--- a/drivers/clk/shmobile/clk-sh73a0.c
+++ b/drivers/clk/shmobile/clk-sh73a0.c
@@ -9,12 +9,12 @@
*/
#include <linux/clk-provider.h>
-#include <linux/clkdev.h>
#include <linux/clk/shmobile.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/of_address.h>
+#include <linux/slab.h>
#include <linux/spinlock.h>
struct sh73a0_cpg {
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h>
2015-06-23 13:09 [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h> Geert Uytterhoeven
@ 2015-06-23 21:23 ` Stephen Boyd
2015-07-16 0:08 ` Stephen Boyd
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2015-06-23 21:23 UTC (permalink / raw)
To: Geert Uytterhoeven, Michael Turquette; +Cc: linux-clk, linux-sh
On 06/23/2015 06:09 AM, Geert Uytterhoeven wrote:
> The CCF implementations for the various shmobile SoCs don't use clkdev
> functionality, hence drop the inclusion of <linux/clkdev.h>.
>
> Add the missing #include <linux/slab.h>, which was included implicitly
> through <asm/clkdev.h> before.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Thanks. I've been making a sweep of all clkdev.h and clk.h includes to
properly split the API. Hopefully send it out tomorrow. I'll throw this
patch into that series.
> drivers/clk/shmobile/clk-div6.c | 2 +-
> drivers/clk/shmobile/clk-r8a73a4.c | 2 +-
> drivers/clk/shmobile/clk-r8a7740.c | 2 +-
> drivers/clk/shmobile/clk-r8a7778.c | 2 +-
> drivers/clk/shmobile/clk-r8a7779.c | 2 +-
> drivers/clk/shmobile/clk-rcar-gen2.c | 4 +---
> drivers/clk/shmobile/clk-sh73a0.c | 2 +-
> 7 files changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/clk/shmobile/clk-div6.c b/drivers/clk/shmobile/clk-div6.c
> index 036a692c72195db9..6810bfb6ef5e09d1 100644
> --- a/drivers/clk/shmobile/clk-div6.c
> +++ b/drivers/clk/shmobile/clk-div6.c
> @@ -11,12 +11,12 @@
> */
>
> #include <linux/clk-provider.h>
> -#include <linux/clkdev.h>
> #include <linux/init.h>
> #include <linux/io.h>
> #include <linux/kernel.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> +#include <linux/slab.h>
>
> #define CPG_DIV6_CKSTP BIT(8)
> #define CPG_DIV6_DIV(d) ((d) & 0x3f)
> diff --git a/drivers/clk/shmobile/clk-r8a73a4.c b/drivers/clk/shmobile/clk-r8a73a4.c
> index 29b9a0b0012ad326..9326204bed9d6cb7 100644
> --- a/drivers/clk/shmobile/clk-r8a73a4.c
> +++ b/drivers/clk/shmobile/clk-r8a73a4.c
> @@ -9,10 +9,10 @@
> */
>
> #include <linux/clk-provider.h>
> -#include <linux/clkdev.h>
> #include <linux/clk/shmobile.h>
> #include <linux/init.h>
> #include <linux/kernel.h>
> +#include <linux/slab.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> #include <linux/spinlock.h>
> diff --git a/drivers/clk/shmobile/clk-r8a7740.c b/drivers/clk/shmobile/clk-r8a7740.c
> index 1e2eaae21e01947b..1e6b1da580658f46 100644
> --- a/drivers/clk/shmobile/clk-r8a7740.c
> +++ b/drivers/clk/shmobile/clk-r8a7740.c
> @@ -9,10 +9,10 @@
> */
>
> #include <linux/clk-provider.h>
> -#include <linux/clkdev.h>
> #include <linux/clk/shmobile.h>
> #include <linux/init.h>
> #include <linux/kernel.h>
> +#include <linux/slab.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> #include <linux/spinlock.h>
> diff --git a/drivers/clk/shmobile/clk-r8a7778.c b/drivers/clk/shmobile/clk-r8a7778.c
> index fa45684e220c78ae..87c1d2f2fb57a46c 100644
> --- a/drivers/clk/shmobile/clk-r8a7778.c
> +++ b/drivers/clk/shmobile/clk-r8a7778.c
> @@ -9,9 +9,9 @@
> */
>
> #include <linux/clk-provider.h>
> -#include <linux/clkdev.h>
> #include <linux/clk/shmobile.h>
> #include <linux/of_address.h>
> +#include <linux/slab.h>
>
> struct r8a7778_cpg {
> struct clk_onecell_data data;
> diff --git a/drivers/clk/shmobile/clk-r8a7779.c b/drivers/clk/shmobile/clk-r8a7779.c
> index e42a63a2ad251de2..92275c5f2c60303e 100644
> --- a/drivers/clk/shmobile/clk-r8a7779.c
> +++ b/drivers/clk/shmobile/clk-r8a7779.c
> @@ -11,12 +11,12 @@
> */
>
> #include <linux/clk-provider.h>
> -#include <linux/clkdev.h>
> #include <linux/clk/shmobile.h>
> #include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> +#include <linux/slab.h>
> #include <linux/spinlock.h>
>
> #include <dt-bindings/clock/r8a7779-clock.h>
> diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c
> index 9612e3145b7ea370..745496f7ee9c7402 100644
> --- a/drivers/clk/shmobile/clk-rcar-gen2.c
> +++ b/drivers/clk/shmobile/clk-rcar-gen2.c
> @@ -11,15 +11,13 @@
> */
>
> #include <linux/clk-provider.h>
> -#include <linux/clkdev.h>
> #include <linux/clk/shmobile.h>
> #include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/math64.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> -#include <linux/pm_clock.h>
> -#include <linux/pm_domain.h>
> +#include <linux/slab.h>
> #include <linux/spinlock.h>
>
> struct rcar_gen2_cpg {
> diff --git a/drivers/clk/shmobile/clk-sh73a0.c b/drivers/clk/shmobile/clk-sh73a0.c
> index cd529cfe412f1d18..8966f8bbfd726e62 100644
> --- a/drivers/clk/shmobile/clk-sh73a0.c
> +++ b/drivers/clk/shmobile/clk-sh73a0.c
> @@ -9,12 +9,12 @@
> */
>
> #include <linux/clk-provider.h>
> -#include <linux/clkdev.h>
> #include <linux/clk/shmobile.h>
> #include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> +#include <linux/slab.h>
> #include <linux/spinlock.h>
>
> struct sh73a0_cpg {
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h>
2015-06-23 13:09 [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h> Geert Uytterhoeven
2015-06-23 21:23 ` Stephen Boyd
@ 2015-07-16 0:08 ` Stephen Boyd
2015-07-16 6:29 ` Geert Uytterhoeven
1 sibling, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2015-07-16 0:08 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Michael Turquette, linux-clk, linux-sh
On 06/23, Geert Uytterhoeven wrote:
> diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c
> index 9612e3145b7ea370..745496f7ee9c7402 100644
> --- a/drivers/clk/shmobile/clk-rcar-gen2.c
> +++ b/drivers/clk/shmobile/clk-rcar-gen2.c
> @@ -11,15 +11,13 @@
> */
>
> #include <linux/clk-provider.h>
> -#include <linux/clkdev.h>
> #include <linux/clk/shmobile.h>
> #include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/math64.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> -#include <linux/pm_clock.h>
> -#include <linux/pm_domain.h>
> +#include <linux/slab.h>
Is this the right diff? I wanted to apply this to clk-next but it
fails here because we don't have the pm_clock.h and pm_domain.h
includes in this file.
> #include <linux/spinlock.h>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h>
2015-07-16 0:08 ` Stephen Boyd
@ 2015-07-16 6:29 ` Geert Uytterhoeven
2015-07-16 17:40 ` Stephen Boyd
0 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2015-07-16 6:29 UTC (permalink / raw)
To: Stephen Boyd
Cc: Geert Uytterhoeven, Michael Turquette, linux-clk, Linux-sh list
Hi Stephen,
On Thu, Jul 16, 2015 at 2:08 AM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 06/23, Geert Uytterhoeven wrote:
>> diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c
>> index 9612e3145b7ea370..745496f7ee9c7402 100644
>> --- a/drivers/clk/shmobile/clk-rcar-gen2.c
>> +++ b/drivers/clk/shmobile/clk-rcar-gen2.c
>> @@ -11,15 +11,13 @@
>> */
>>
>> #include <linux/clk-provider.h>
>> -#include <linux/clkdev.h>
>> #include <linux/clk/shmobile.h>
>> #include <linux/init.h>
>> #include <linux/kernel.h>
>> #include <linux/math64.h>
>> #include <linux/of.h>
>> #include <linux/of_address.h>
>> -#include <linux/pm_clock.h>
>> -#include <linux/pm_domain.h>
>> +#include <linux/slab.h>
>
> Is this the right diff? I wanted to apply this to clk-next but it
> fails here because we don't have the pm_clock.h and pm_domain.h
> includes in this file.
>
>> #include <linux/spinlock.h>
Oops, these two lines were due to a bad rebase, and shouldn't be there.
Just ignore them. Sorry for the trouble.
Shall I send a new patch?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h>
2015-07-16 6:29 ` Geert Uytterhoeven
@ 2015-07-16 17:40 ` Stephen Boyd
2015-07-16 18:23 ` Geert Uytterhoeven
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2015-07-16 17:40 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Geert Uytterhoeven, Michael Turquette, linux-clk, Linux-sh list
On 07/15/2015 11:29 PM, Geert Uytterhoeven wrote:
> Hi Stephen,
>
> On Thu, Jul 16, 2015 at 2:08 AM, Stephen Boyd <sboyd@codeaurora.org> wrote:
>> On 06/23, Geert Uytterhoeven wrote:
>>> diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c b/drivers/clk/shmobile/clk-rcar-gen2.c
>>> index 9612e3145b7ea370..745496f7ee9c7402 100644
>>> --- a/drivers/clk/shmobile/clk-rcar-gen2.c
>>> +++ b/drivers/clk/shmobile/clk-rcar-gen2.c
>>> @@ -11,15 +11,13 @@
>>> */
>>>
>>> #include <linux/clk-provider.h>
>>> -#include <linux/clkdev.h>
>>> #include <linux/clk/shmobile.h>
>>> #include <linux/init.h>
>>> #include <linux/kernel.h>
>>> #include <linux/math64.h>
>>> #include <linux/of.h>
>>> #include <linux/of_address.h>
>>> -#include <linux/pm_clock.h>
>>> -#include <linux/pm_domain.h>
>>> +#include <linux/slab.h>
>> Is this the right diff? I wanted to apply this to clk-next but it
>> fails here because we don't have the pm_clock.h and pm_domain.h
>> includes in this file.
>>
>>> #include <linux/spinlock.h>
> Oops, these two lines were due to a bad rebase, and shouldn't be there.
> Just ignore them. Sorry for the trouble.
>
> Shall I send a new patch?
>
No need. I fixed it up when applying.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h>
2015-07-16 17:40 ` Stephen Boyd
@ 2015-07-16 18:23 ` Geert Uytterhoeven
0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2015-07-16 18:23 UTC (permalink / raw)
To: Stephen Boyd
Cc: Geert Uytterhoeven, Michael Turquette, linux-clk, Linux-sh list
Hi Stephen,
On Thu, Jul 16, 2015 at 7:40 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 07/15/2015 11:29 PM, Geert Uytterhoeven wrote:
>> On Thu, Jul 16, 2015 at 2:08 AM, Stephen Boyd <sboyd@codeaurora.org>
>> wrote:
>>>
>>> On 06/23, Geert Uytterhoeven wrote:
>>>>
>>>> diff --git a/drivers/clk/shmobile/clk-rcar-gen2.c
>>>> b/drivers/clk/shmobile/clk-rcar-gen2.c
>>>> index 9612e3145b7ea370..745496f7ee9c7402 100644
>>>> --- a/drivers/clk/shmobile/clk-rcar-gen2.c
>>>> +++ b/drivers/clk/shmobile/clk-rcar-gen2.c
>>>> @@ -11,15 +11,13 @@
>>>> */
>>>>
>>>> #include <linux/clk-provider.h>
>>>> -#include <linux/clkdev.h>
>>>> #include <linux/clk/shmobile.h>
>>>> #include <linux/init.h>
>>>> #include <linux/kernel.h>
>>>> #include <linux/math64.h>
>>>> #include <linux/of.h>
>>>> #include <linux/of_address.h>
>>>> -#include <linux/pm_clock.h>
>>>> -#include <linux/pm_domain.h>
>>>> +#include <linux/slab.h>
>>>
>>> Is this the right diff? I wanted to apply this to clk-next but it
>>> fails here because we don't have the pm_clock.h and pm_domain.h
>>> includes in this file.
>>>
>>>> #include <linux/spinlock.h>
>>
>> Oops, these two lines were due to a bad rebase, and shouldn't be there.
>> Just ignore them. Sorry for the trouble.
>>
>> Shall I send a new patch?
>
> No need. I fixed it up when applying.
Thanks a lot!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-07-16 18:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-23 13:09 [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h> Geert Uytterhoeven
2015-06-23 21:23 ` Stephen Boyd
2015-07-16 0:08 ` Stephen Boyd
2015-07-16 6:29 ` Geert Uytterhoeven
2015-07-16 17:40 ` Stephen Boyd
2015-07-16 18:23 ` Geert Uytterhoeven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox