Skip to contentSkip to conversation

picoxcell cleanups for 3.11

GIT PULL Jamie Iles 2 participants 6 messages Jun 11, 2013 – Jun 20, 2013

Subsystems (2)
lore
Share & tools
lore

Jamie Iles

author
#0 lore raw

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
author
#1 lore raw

Fixing Arnd's mail address (sorry!).

Jamie

Quoted 32 lines · Jamie Iles

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
#2 lore raw
Quoted 6 lines · Jamie Iles
Quoted 5 lines · Jamie Iles

Hi Arnd, Olof,

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

Pulled into next/cleanup, thanks!

Arnd

#3 lore raw
In reply to Jamie Iles
Quoted 1 line · Jamie Iles

Fixing Arnd's mail address (sorry!).

you did forget to fix up Olof's address though.

Quoted 6 lines
Quoted 6 lines

----------------------------------------------------------------
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?

arch/arm/mach-picoxcell/common.c +0 -1
index 8267c5d..b13f51b 100644
@@ -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,
author
#4 lore raw

Hi Arnd,

Quoted 4 lines · Arnd Bergmann
Quoted 1 line · Jamie Iles

Fixing Arnd's mail address (sorry!).

you did forget to fix up Olof's address though.

Gah, fat fingers!

Quoted 7 lines
Quoted 6 lines
Quoted 6 lines

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

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

Quoted 7 lines

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

Quoted 12 lines
arch/arm/mach-picoxcell/common.c +0 -1
index 8267c5d..b13f51b 100644
@@ -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,
#5 lore raw
Quoted 10 lines · Jamie Iles
Quoted 10 lines
Quoted 6 lines
Quoted 6 lines

----------------------------------------------------------------
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.

Quoted 8 lines
Quoted 4 lines

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