Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d619d8a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Gregory CLEMENT
Browse files

ARM: mv78xx0: simplify ethernet device creation 



Out of the four ethernet devices on mv78xx0, only the first one
has an error interrupt line, for the other ones we pass NO_IRQ
and then ignore the argument.

In order to get closer to complete remove of NO_IRQ, this simply
drops the unused function arguments.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 29b4817d

arch/arm/mach-mv78xx0/common.c

+2 −7
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge01_init(eth_data,

			GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,

			NO_IRQ,

			MV643XX_TX_CSUM_DEFAULT_LIMIT);

}
@@ -242,9 +241,7 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data) 
		eth_data->duplex = DUPLEX_FULL;

	}



	orion_ge10_init(eth_data,

			GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM,

			NO_IRQ);

	orion_ge10_init(eth_data, GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM);

}
@@ -266,9 +263,7 @@ void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data) 
		eth_data->duplex = DUPLEX_FULL;

	}



	orion_ge11_init(eth_data,

			GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM,

			NO_IRQ);

	orion_ge11_init(eth_data, GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM);

}



/*****************************************************************************

arch/arm/plat-orion/common.c

+2 −5
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ static struct platform_device orion_ge01 = { 
void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,

			    unsigned long mapbase,

			    unsigned long irq,

			    unsigned long irq_err,

			    unsigned int tx_csum_limit)

{

	fill_resources(&orion_ge01_shared, orion_ge01_shared_resources,
@@ -404,8 +403,7 @@ static struct platform_device orion_ge10 = { 


void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,

			    unsigned long mapbase,

			    unsigned long irq,

			    unsigned long irq_err)

			    unsigned long irq)

{

	fill_resources(&orion_ge10_shared, orion_ge10_shared_resources,

		       mapbase + 0x2000, SZ_16K - 1, NO_IRQ);
@@ -453,8 +451,7 @@ static struct platform_device orion_ge11 = { 


void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,

			    unsigned long mapbase,

			    unsigned long irq,

			    unsigned long irq_err)

			    unsigned long irq)

{

	fill_resources(&orion_ge11_shared, orion_ge11_shared_resources,

		       mapbase + 0x2000, SZ_16K - 1, NO_IRQ);

arch/arm/plat-orion/include/plat/common.h

+2 −5
Original line number Diff line number Diff line
@@ -47,18 +47,15 @@ void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data, 
void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,

			    unsigned long mapbase,

			    unsigned long irq,

			    unsigned long irq_err,

			    unsigned int tx_csum_limit);



void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,

			    unsigned long mapbase,

			    unsigned long irq,

			    unsigned long irq_err);

			    unsigned long irq);



void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,

			    unsigned long mapbase,

			    unsigned long irq,

			    unsigned long irq_err);

			    unsigned long irq);



void __init orion_ge00_switch_init(struct dsa_platform_data *d,

				   int irq);