diff mbox

[1/2] ARM: zynq: cpuidle: Remove useless compatibility string

Message ID 1380269867-18336-1-git-send-email-daniel.lezcano@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Lezcano Sept. 27, 2013, 8:17 a.m. UTC
All zynq platforms have this compatibility string and there is no any other
clone.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/cpuidle/cpuidle-zynq.c |    4 ----
 1 file changed, 4 deletions(-)

Comments

Michal Simek Sept. 27, 2013, 8:19 a.m. UTC | #1
On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
> All zynq platforms have this compatibility string and there is no any other
> clone.
> 
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> ---
>  drivers/cpuidle/cpuidle-zynq.c |    4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
> index 38e03a1..ab6c4b4 100644
> --- a/drivers/cpuidle/cpuidle-zynq.c
> +++ b/drivers/cpuidle/cpuidle-zynq.c
> @@ -28,7 +28,6 @@
>  #include <linux/init.h>
>  #include <linux/cpu_pm.h>
>  #include <linux/cpuidle.h>
> -#include <linux/of.h>
>  #include <asm/proc-fns.h>
>  #include <asm/cpuidle.h>
>  
> @@ -72,9 +71,6 @@ static struct cpuidle_driver zynq_idle_driver = {
>  /* Initialize CPU idle by registering the idle states */
>  static int __init zynq_cpuidle_init(void)
>  {
> -	if (!of_machine_is_compatible("xlnx,zynq-7000"))
> -		return -ENODEV;
> -
>  	pr_info("Xilinx Zynq CpuIdle Driver started\n");
>  
>  	return cpuidle_register(&zynq_idle_driver, NULL);
> 

Acked-by: Michal Simek <michal.simek@xilinx.com>

Thx,
M
Daniel Lezcano Sept. 27, 2013, 8:19 a.m. UTC | #2
On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
> All zynq platforms have this compatibility string and there is no any other
> clone.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

As I don't have the hardware, this patchset is just compile tested.

> ---
>   drivers/cpuidle/cpuidle-zynq.c |    4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
> index 38e03a1..ab6c4b4 100644
> --- a/drivers/cpuidle/cpuidle-zynq.c
> +++ b/drivers/cpuidle/cpuidle-zynq.c
> @@ -28,7 +28,6 @@
>   #include <linux/init.h>
>   #include <linux/cpu_pm.h>
>   #include <linux/cpuidle.h>
> -#include <linux/of.h>
>   #include <asm/proc-fns.h>
>   #include <asm/cpuidle.h>
>
> @@ -72,9 +71,6 @@ static struct cpuidle_driver zynq_idle_driver = {
>   /* Initialize CPU idle by registering the idle states */
>   static int __init zynq_cpuidle_init(void)
>   {
> -	if (!of_machine_is_compatible("xlnx,zynq-7000"))
> -		return -ENODEV;
> -
>   	pr_info("Xilinx Zynq CpuIdle Driver started\n");
>
>   	return cpuidle_register(&zynq_idle_driver, NULL);
>
Daniel Lezcano Sept. 27, 2013, 8:35 a.m. UTC | #3
On 09/27/2013 10:19 AM, Michal Simek wrote:
> On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
>> All zynq platforms have this compatibility string and there is no any other
>> clone.
>>
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

The patchset is only compile-tested (I don't have the hardware).

Michal or someone else, if you have the time can you give it a try ?

Thanks in advance

   -- Daniel

>> ---
>>   drivers/cpuidle/cpuidle-zynq.c |    4 ----
>>   1 file changed, 4 deletions(-)
>>
>> diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
>> index 38e03a1..ab6c4b4 100644
>> --- a/drivers/cpuidle/cpuidle-zynq.c
>> +++ b/drivers/cpuidle/cpuidle-zynq.c
>> @@ -28,7 +28,6 @@
>>   #include <linux/init.h>
>>   #include <linux/cpu_pm.h>
>>   #include <linux/cpuidle.h>
>> -#include <linux/of.h>
>>   #include <asm/proc-fns.h>
>>   #include <asm/cpuidle.h>
>>
>> @@ -72,9 +71,6 @@ static struct cpuidle_driver zynq_idle_driver = {
>>   /* Initialize CPU idle by registering the idle states */
>>   static int __init zynq_cpuidle_init(void)
>>   {
>> -	if (!of_machine_is_compatible("xlnx,zynq-7000"))
>> -		return -ENODEV;
>> -
>>   	pr_info("Xilinx Zynq CpuIdle Driver started\n");
>>
>>   	return cpuidle_register(&zynq_idle_driver, NULL);
>>
>
> Acked-by: Michal Simek <michal.simek@xilinx.com>
>
> Thx,
> M
>
>
Michal Simek Sept. 27, 2013, 8:51 a.m. UTC | #4
On 09/27/2013 10:35 AM, Daniel Lezcano wrote:
> On 09/27/2013 10:19 AM, Michal Simek wrote:
>> On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
>>> All zynq platforms have this compatibility string and there is no any other
>>> clone.
>>>
>>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> 
> The patchset is only compile-tested (I don't have the hardware).
> 
> Michal or someone else, if you have the time can you give it a try ?
> 

Soren: Can you please retest it on hw?

Thanks,
Michal
Soren Brinkmann Sept. 27, 2013, 3:58 p.m. UTC | #5
On Fri, Sep 27, 2013 at 10:51:43AM +0200, Michal Simek wrote:
> On 09/27/2013 10:35 AM, Daniel Lezcano wrote:
> > On 09/27/2013 10:19 AM, Michal Simek wrote:
> >> On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
> >>> All zynq platforms have this compatibility string and there is no any other
> >>> clone.
> >>>
> >>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> > 
> > The patchset is only compile-tested (I don't have the hardware).
> > 
> > Michal or someone else, if you have the time can you give it a try ?
> > 
> 
> Soren: Can you please retest it on hw?
Hmm, I'm not subscribed to LAKML (only LKML), but well found the series on
patchworks.

The series introduces new build warnings:
WARNING: drivers/cpuidle/built-in.o(.data+0x28c): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
The variable zynq_cpuidle_driver references
the function __init zynq_cpuidle_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

  CC      kernel/trace/trace.o
  LD      drivers/built-in.o
WARNING: drivers/built-in.o(.data+0x13870): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
The variable zynq_cpuidle_driver references
the function __init zynq_cpuidle_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

  LD      kernel/trace/built-in.o
  LD      kernel/built-in.o
  LINK    vmlinux
  LD      vmlinux.o
  MODPOST vmlinux.o
WARNING: vmlinux.o(.data+0x2e0b0): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
The variable zynq_cpuidle_driver references
the function __init zynq_cpuidle_probe()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console


Other than that it looks good. I assume there is just some __init
annotation missing somewhere. Feel free to add my 'Tested-by'.

	Sören
Daniel Lezcano Sept. 27, 2013, 4:36 p.m. UTC | #6
On 09/27/2013 05:58 PM, Sören Brinkmann wrote:
> On Fri, Sep 27, 2013 at 10:51:43AM +0200, Michal Simek wrote:
>> On 09/27/2013 10:35 AM, Daniel Lezcano wrote:
>>> On 09/27/2013 10:19 AM, Michal Simek wrote:
>>>> On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
>>>>> All zynq platforms have this compatibility string and there is no any other
>>>>> clone.
>>>>>
>>>>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>>>
>>> The patchset is only compile-tested (I don't have the hardware).
>>>
>>> Michal or someone else, if you have the time can you give it a try ?
>>>
>>
>> Soren: Can you please retest it on hw?
> Hmm, I'm not subscribed to LAKML (only LKML), but well found the series on
> patchworks.
>
> The series introduces new build warnings:
> WARNING: drivers/cpuidle/built-in.o(.data+0x28c): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> The variable zynq_cpuidle_driver references
> the function __init zynq_cpuidle_probe()
> If the reference is valid then annotate the
> variable with __init* or __refdata (see linux/init.h) or name the variable:
> *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
>
>    CC      kernel/trace/trace.o
>    LD      drivers/built-in.o
> WARNING: drivers/built-in.o(.data+0x13870): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> The variable zynq_cpuidle_driver references
> the function __init zynq_cpuidle_probe()
> If the reference is valid then annotate the
> variable with __init* or __refdata (see linux/init.h) or name the variable:
> *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
>
>    LD      kernel/trace/built-in.o
>    LD      kernel/built-in.o
>    LINK    vmlinux
>    LD      vmlinux.o
>    MODPOST vmlinux.o
> WARNING: vmlinux.o(.data+0x2e0b0): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> The variable zynq_cpuidle_driver references
> the function __init zynq_cpuidle_probe()
> If the reference is valid then annotate the
> variable with __init* or __refdata (see linux/init.h) or name the variable:
> *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

Oops, right, I missed the section mismatch. Thanks for pointing this out.

> Other than that it looks good. I assume there is just some __init
> annotation missing somewhere. Feel free to add my 'Tested-by'.

Cool ! Thanks Soren for testing.

I will take the patchn with the init section fixed, in my tree if you 
are ok with that.

   -- Daniel
Soren Brinkmann Sept. 27, 2013, 4:40 p.m. UTC | #7
On Fri, Sep 27, 2013 at 06:36:14PM +0200, Daniel Lezcano wrote:
> On 09/27/2013 05:58 PM, Sören Brinkmann wrote:
> >On Fri, Sep 27, 2013 at 10:51:43AM +0200, Michal Simek wrote:
> >>On 09/27/2013 10:35 AM, Daniel Lezcano wrote:
> >>>On 09/27/2013 10:19 AM, Michal Simek wrote:
> >>>>On 09/27/2013 10:17 AM, Daniel Lezcano wrote:
> >>>>>All zynq platforms have this compatibility string and there is no any other
> >>>>>clone.
> >>>>>
> >>>>>Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> >>>
> >>>The patchset is only compile-tested (I don't have the hardware).
> >>>
> >>>Michal or someone else, if you have the time can you give it a try ?
> >>>
> >>
> >>Soren: Can you please retest it on hw?
> >Hmm, I'm not subscribed to LAKML (only LKML), but well found the series on
> >patchworks.
> >
> >The series introduces new build warnings:
> >WARNING: drivers/cpuidle/built-in.o(.data+0x28c): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> >The variable zynq_cpuidle_driver references
> >the function __init zynq_cpuidle_probe()
> >If the reference is valid then annotate the
> >variable with __init* or __refdata (see linux/init.h) or name the variable:
> >*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
> >
> >   CC      kernel/trace/trace.o
> >   LD      drivers/built-in.o
> >WARNING: drivers/built-in.o(.data+0x13870): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> >The variable zynq_cpuidle_driver references
> >the function __init zynq_cpuidle_probe()
> >If the reference is valid then annotate the
> >variable with __init* or __refdata (see linux/init.h) or name the variable:
> >*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
> >
> >   LD      kernel/trace/built-in.o
> >   LD      kernel/built-in.o
> >   LINK    vmlinux
> >   LD      vmlinux.o
> >   MODPOST vmlinux.o
> >WARNING: vmlinux.o(.data+0x2e0b0): Section mismatch in reference from the variable zynq_cpuidle_driver to the function .init.text:zynq_cpuidle_probe()
> >The variable zynq_cpuidle_driver references
> >the function __init zynq_cpuidle_probe()
> >If the reference is valid then annotate the
> >variable with __init* or __refdata (see linux/init.h) or name the variable:
> >*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
> 
> Oops, right, I missed the section mismatch. Thanks for pointing this out.
> 
> >Other than that it looks good. I assume there is just some __init
> >annotation missing somewhere. Feel free to add my 'Tested-by'.
> 
> Cool ! Thanks Soren for testing.
> 
> I will take the patchn with the init section fixed, in my tree if
> you are ok with that.
Sounds good to me.

	Sören
diff mbox

Patch

diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c
index 38e03a1..ab6c4b4 100644
--- a/drivers/cpuidle/cpuidle-zynq.c
+++ b/drivers/cpuidle/cpuidle-zynq.c
@@ -28,7 +28,6 @@ 
 #include <linux/init.h>
 #include <linux/cpu_pm.h>
 #include <linux/cpuidle.h>
-#include <linux/of.h>
 #include <asm/proc-fns.h>
 #include <asm/cpuidle.h>
 
@@ -72,9 +71,6 @@  static struct cpuidle_driver zynq_idle_driver = {
 /* Initialize CPU idle by registering the idle states */
 static int __init zynq_cpuidle_init(void)
 {
-	if (!of_machine_is_compatible("xlnx,zynq-7000"))
-		return -ENODEV;
-
 	pr_info("Xilinx Zynq CpuIdle Driver started\n");
 
 	return cpuidle_register(&zynq_idle_driver, NULL);