Patchwork [GIT,PULL] picoxcell cleanups for 3.11

login
register
mail settings
Submitter Jamie Iles
Date June 11, 2013, 12:26 p.m.
Message ID <20130611122621.GA9967@page>
Download mbox
Permalink /patch/250544/
State New
Headers show

Pull-request

git://github.com/jamieiles/linux-2.6-ji.git picoxcell-next

Comments

Jamie Iles - June 11, 2013, 12:26 p.m.
Hi Arnd, Olof,

Please pull these small changes for 3.11 to cleanup the picoxcell machine
support.

Thanks,

Jamie

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

  git://github.com/jamieiles/linux-2.6-ji.git picoxcell-next

for you to fetch changes up to 4b83f75a7af388aaf5f79ccf72c37074bc9166da:

  ARM: picoxcell: Remove init_irq declaration in machine description (2013-05-14 17:19:12 +0100)

----------------------------------------------------------------
Jamie Iles (1):
      picoxcell: remove redundant common.h

Maxime Ripard (1):
      ARM: picoxcell: Remove init_irq declaration in machine description

 arch/arm/mach-picoxcell/common.c |  7 -------
 arch/arm/mach-picoxcell/common.h | 17 -----------------
 2 files changed, 24 deletions(-)
 delete mode 100644 arch/arm/mach-picoxcell/common.h
Jamie Iles - June 19, 2013, 10:02 a.m.
Fixing Arnd's mail address (sorry!).

Jamie

On Tue, Jun 11, 2013 at 01:26:21PM +0100, Jamie Iles wrote:
> Hi Arnd, Olof,
> 
> Please pull these small changes for 3.11 to cleanup the picoxcell machine
> support.
> 
> Thanks,
> 
> Jamie
> 
> The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:
> 
>   Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)
> 
> are available in the git repository at:
> 
>   git://github.com/jamieiles/linux-2.6-ji.git picoxcell-next
> 
> for you to fetch changes up to 4b83f75a7af388aaf5f79ccf72c37074bc9166da:
> 
>   ARM: picoxcell: Remove init_irq declaration in machine description (2013-05-14 17:19:12 +0100)
> 
> ----------------------------------------------------------------
> Jamie Iles (1):
>       picoxcell: remove redundant common.h
> 
> Maxime Ripard (1):
>       ARM: picoxcell: Remove init_irq declaration in machine description
> 
>  arch/arm/mach-picoxcell/common.c |  7 -------
>  arch/arm/mach-picoxcell/common.h | 17 -----------------
>  2 files changed, 24 deletions(-)
>  delete mode 100644 arch/arm/mach-picoxcell/common.h
Arnd Bergmann - June 20, 2013, 1:31 p.m.
On Wednesday 19 June 2013, Jamie Iles wrote:
> On Tue, Jun 11, 2013 at 01:26:21PM +0100, Jamie Iles wrote:
> > Hi Arnd, Olof,
> > 
> > Please pull these small changes for 3.11 to cleanup the picoxcell machine
> > support.
> > 

Pulled into next/cleanup, thanks!

	Arnd
Jamie Iles - June 20, 2013, 2:57 p.m.
Hi Arnd,

On Thu, Jun 20, 2013 at 04:24:09PM +0200, Arnd Bergmann wrote:
> On Wednesday 19 June 2013, Jamie Iles wrote:
> > Fixing Arnd's mail address (sorry!).
> 
> you did forget to fix up Olof's address though.

Gah, fat fingers!

> > > ----------------------------------------------------------------
> > > Jamie Iles (1):
> > >       picoxcell: remove redundant common.h
> > > 
> > > Maxime Ripard (1):
> > >       ARM: picoxcell: Remove init_irq declaration in machine description
> 
> I got a regression since NR_IRQS_LEGACY is not defined with the headers
> removed.
> 
> I think we can just remove this line as well, since NR_IRQS_LEGACY is
> the default anyway.
> 
> Does that work?

I can't reproduce the failure here with my config, I guess it's getting 
included through one of the other includes.  Either way, your fix looks 
good to me.

Thanks,

Jamie

> diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
> index 8267c5d..b13f51b 100644
> --- a/arch/arm/mach-picoxcell/common.c
> +++ b/arch/arm/mach-picoxcell/common.c
> @@ -79,7 +79,6 @@ static void picoxcell_wdt_restart(char mode, const char *cmd)
>  
>  DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
>  	.map_io		= picoxcell_map_io,
> -	.nr_irqs	= NR_IRQS_LEGACY,
>  	.init_machine	= picoxcell_init_machine,
>  	.dt_compat	= picoxcell_dt_match,
>  	.restart	= picoxcell_wdt_restart,
Arnd Bergmann - June 20, 2013, 6:45 p.m.
On Thursday 20 June 2013, Jamie Iles wrote:
> > > > ----------------------------------------------------------------
> > > > Jamie Iles (1):
> > > >       picoxcell: remove redundant common.h
> > > > 
> > > > Maxime Ripard (1):
> > > >       ARM: picoxcell: Remove init_irq declaration in machine description
> > 
> > I got a regression since NR_IRQS_LEGACY is not defined with the headers
> > removed.
> > 
> > I think we can just remove this line as well, since NR_IRQS_LEGACY is
> > the default anyway.
> > 
> > Does that work?
> 
> I can't reproduce the failure here with my config, I guess it's getting 
> included through one of the other includes.  Either way, your fix looks 
> good to me.

I only saw the problem in allmodconfig, not multi_v7_defconfig.

Applied the fix now with your Ack.

	Arnd