From: Stephen Boyd <sboyd@codeaurora.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>,
Michael Turquette <mturquette@baylibre.com>,
linux-clk@vger.kernel.org,
Linux-sh list <linux-sh@vger.kernel.org>
Subject: Re: [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h>
Date: Thu, 16 Jul 2015 10:40:02 -0700 [thread overview]
Message-ID: <55A7EC72.7070905@codeaurora.org> (raw)
In-Reply-To: <CAMuHMdXnUgWFCrEt6hBh9bThzk-VexoyU54h-xmiWeShMLmzeg@mail.gmail.com>
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
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Boyd <sboyd@codeaurora.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>,
Michael Turquette <mturquette@baylibre.com>,
linux-clk@vger.kernel.org,
Linux-sh list <linux-sh@vger.kernel.org>
Subject: Re: [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h>
Date: Thu, 16 Jul 2015 17:40:02 +0000 [thread overview]
Message-ID: <55A7EC72.7070905@codeaurora.org> (raw)
In-Reply-To: <CAMuHMdXnUgWFCrEt6hBh9bThzk-VexoyU54h-xmiWeShMLmzeg@mail.gmail.com>
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
next prev parent reply other threads:[~2015-07-16 17:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-23 13:09 [PATCH] clk: shmobile: Remove unneeded #include <linux/clkdev.h> Geert Uytterhoeven
2015-06-23 13:09 ` Geert Uytterhoeven
2015-06-23 21:23 ` Stephen Boyd
2015-06-23 21:23 ` Stephen Boyd
2015-07-16 0:08 ` Stephen Boyd
2015-07-16 0:08 ` Stephen Boyd
2015-07-16 6:29 ` Geert Uytterhoeven
2015-07-16 6:29 ` Geert Uytterhoeven
2015-07-16 17:40 ` Stephen Boyd [this message]
2015-07-16 17:40 ` Stephen Boyd
2015-07-16 18:23 ` Geert Uytterhoeven
2015-07-16 18:23 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55A7EC72.7070905@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=geert+renesas@glider.be \
--cc=geert@linux-m68k.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=mturquette@baylibre.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.