diff mbox

[RFC,V2,3/8] ARM: kirkwood: nsa310: cleanup includes and unneeded code

Message ID 31142087d93c2713d067f4ccf470810e6e71f17b.1359091286.git.jason@lakedaemon.net (mailing list archive)
State New, archived
Headers show

Commit Message

Jason Cooper Jan. 25, 2013, 5:32 a.m. UTC
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
 arch/arm/mach-kirkwood/board-nsa310.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Comments

Sergei Shtylyov Jan. 26, 2013, 8:08 p.m. UTC | #1
Hello.

On 25-01-2013 9:32, Jason Cooper wrote:

> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> ---
>   arch/arm/mach-kirkwood/board-nsa310.c | 9 +--------
>   1 file changed, 1 insertion(+), 8 deletions(-)

> diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
> index 1bd328d..0b99533 100644
> --- a/arch/arm/mach-kirkwood/board-nsa310.c
> +++ b/arch/arm/mach-kirkwood/board-nsa310.c
> @@ -10,11 +10,8 @@
>
>   #include <linux/kernel.h>
>   #include <linux/init.h>
> -#include <linux/i2c.h>
> -
> -#include <asm/mach-types.h>
> -#include <asm/mach/arch.h>
>   #include <mach/kirkwood.h>
> +#include <linux/of.h>

    You also add an #include and don't mention it anywhere. Or is that part of 
the cleanup?

WBR, Sergei
Jason Cooper Jan. 26, 2013, 8:22 p.m. UTC | #2
On Sun, Jan 27, 2013 at 12:08:44AM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 25-01-2013 9:32, Jason Cooper wrote:
> 
> >Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> >---
> >  arch/arm/mach-kirkwood/board-nsa310.c | 9 +--------
> >  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> >diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
> >index 1bd328d..0b99533 100644
> >--- a/arch/arm/mach-kirkwood/board-nsa310.c
> >+++ b/arch/arm/mach-kirkwood/board-nsa310.c
> >@@ -10,11 +10,8 @@
> >
> >  #include <linux/kernel.h>
> >  #include <linux/init.h>
> >-#include <linux/i2c.h>
> >-
> >-#include <asm/mach-types.h>
> >-#include <asm/mach/arch.h>
> >  #include <mach/kirkwood.h>
> >+#include <linux/of.h>
> 
>    You also add an #include and don't mention it anywhere. Or is
> that part of the cleanup?

After removing the unneeded linux/i2c.h, linux/of.h was needed for
of_machine_is_compatible().  i2c.h had included of.h.

thanks for the review,

Jason.
Sergei Shtylyov Jan. 27, 2013, 3:04 p.m. UTC | #3
Hello.

On 27-01-2013 0:22, Jason Cooper wrote:

>>> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
>>> ---
>>>   arch/arm/mach-kirkwood/board-nsa310.c | 9 +--------
>>>   1 file changed, 1 insertion(+), 8 deletions(-)

>>> diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
>>> index 1bd328d..0b99533 100644
>>> --- a/arch/arm/mach-kirkwood/board-nsa310.c
>>> +++ b/arch/arm/mach-kirkwood/board-nsa310.c
>>> @@ -10,11 +10,8 @@
>>>
>>>   #include <linux/kernel.h>
>>>   #include <linux/init.h>
>>> -#include <linux/i2c.h>
>>> -
>>> -#include <asm/mach-types.h>
>>> -#include <asm/mach/arch.h>
>>>   #include <mach/kirkwood.h>
>>> +#include <linux/of.h>

>>     You also add an #include and don't mention it anywhere. Or is
>> that part of the cleanup?

> After removing the unneeded linux/i2c.h, linux/of.h was needed for
> of_machine_is_compatible().  i2c.h had included of.h.

    Would be worth mentioning it in the changelog.

> thanks for the review,

> Jason.

WBR, Sergei
Jason Cooper Jan. 27, 2013, 3:26 p.m. UTC | #4
On Sun, Jan 27, 2013 at 07:04:57PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 27-01-2013 0:22, Jason Cooper wrote:
> 
> >>>Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> >>>---
> >>>  arch/arm/mach-kirkwood/board-nsa310.c | 9 +--------
> >>>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> >>>diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
> >>>index 1bd328d..0b99533 100644
> >>>--- a/arch/arm/mach-kirkwood/board-nsa310.c
> >>>+++ b/arch/arm/mach-kirkwood/board-nsa310.c
> >>>@@ -10,11 +10,8 @@
> >>>
> >>>  #include <linux/kernel.h>
> >>>  #include <linux/init.h>
> >>>-#include <linux/i2c.h>
> >>>-
> >>>-#include <asm/mach-types.h>
> >>>-#include <asm/mach/arch.h>
> >>>  #include <mach/kirkwood.h>
> >>>+#include <linux/of.h>
> 
> >>    You also add an #include and don't mention it anywhere. Or is
> >>that part of the cleanup?
> 
> >After removing the unneeded linux/i2c.h, linux/of.h was needed for
> >of_machine_is_compatible().  i2c.h had included of.h.
> 
>    Would be worth mentioning it in the changelog.

Ok, I'll add it when I pull it in.

thx,

Jason.
diff mbox

Patch

diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
index 1bd328d..0b99533 100644
--- a/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/arch/arm/mach-kirkwood/board-nsa310.c
@@ -10,11 +10,8 @@ 
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/i2c.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
+#include <linux/of.h>
 #include "common.h"
 #include "mpp.h"
 
@@ -40,11 +37,7 @@  static unsigned int nsa310_mpp_config[] __initdata = {
 
 void __init nsa310_init(void)
 {
-	u32 dev, rev;
-
 	kirkwood_mpp_conf(nsa310_mpp_config);
-
-	kirkwood_pcie_id(&dev, &rev);
 }
 
 static int __init nsa310_pci_init(void)