From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756572AbcIFOGq (ORCPT ); Tue, 6 Sep 2016 10:06:46 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:61194 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756501AbcIFOGj (ORCPT ); Tue, 6 Sep 2016 10:06:39 -0400 From: Arnd Bergmann To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Cc: linux-arm-kernel@lists.infradead.org, Russell King , linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 1/4] ARM: mv78xx0: simplify ethernet device creation Date: Tue, 6 Sep 2016 16:06:20 +0200 Message-Id: <20160906140623.2853066-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Yzn73zK/S2Go0oy05is7dKs9uDjcREttWeQAPIEO3Zt8vMQ5dIq huVKgiU0dmm9CZYhcoQzvZnJ8f5ZgiGnwUJThx5QGl2FPm/iiRHVvEqY9+RiOEc/SV1zd9r 6pKa8tnnWr5oJMC948WfcOivcNGQoPwkfD0Xe5OSxSKFkx4/EzlaO43TZs5EsgDDkWBULZg vlj3qOz6UYkhcTZyIZhow== X-UI-Out-Filterresults: notjunk:1;V01:K0:PDRhCL5S22I=:xzhZP6lqaxRFLcDOweE91B NnRRgiazAberMfcpxN4jp1C5K27hixh0TrWuiZTlL78wL+P5AirC/n/hxB6sGqSPLu2irSyS9 SJnep/tnSZdHo1CNx6yTx+RJksRSzkIXc7img0CS/0VBQgSNnbJp7+RrUC+bar22j7QrpSUXT Jqb4slCR+iAwdFbB0lapVTz3kzSHuyCc/BmVULyxF2oRcj3Jq0AZD1cSVKrbrk6K9kkHWi4ye op26A7hEcn5hyz3B2WMSRMNQgttW1XGQgxFZ/xP6U7wd+eXYjU92E2fdx0uq2bg9UOXdASH/c zckZusV7xYgJn8cSrYmp3d8WtsLZF3OknwTSaOn6c/NFl6LOvM/TTfye6e095Gdf4vnUEJjCO 6prWeaw4/FK7mq4UTbwdB7skNtO+4kNy09VHChO4DS0e94uKV7e1CBpb+l34vvvxmzB2VQXFT MsCY/1GdTHej9RSYvFyJbH16xstNjCSYpTxz943WgoWOyoJmUZWUluIkg8ItuPPNyZZtplwmm 09kqdjqWAN11HnoQVBwva7W2qH5mkWj+C86+J7g0RLc3gzquvomADJghuhvtsRvHzcm3I3rDF xQ+ZCyh6048BKt+8nNinJvSbNQJCMCCUewGFq+N62RKgiQyJYuLhvbJYB2yJOEnZuWQlCstNR gZbYuCmlXh9m/h3y36uvcVY5QkXp32JP4HuLI7T8OsUheyLQL/54w6FGfChvtmDd7mAM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Arnd Bergmann --- arch/arm/mach-mv78xx0/common.c | 9 ++------- arch/arm/plat-orion/common.c | 7 ++----- arch/arm/plat-orion/include/plat/common.h | 7 ++----- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index 6af5430d0d97..f72e1e9f5fc5 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c @@ -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); } /***************************************************************************** diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 78c8bf4043c0..7757f71fe709 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -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); diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h index 9e6d76ad48a9..8519727faa5e 100644 --- a/arch/arm/plat-orion/include/plat/common.h +++ b/arch/arm/plat-orion/include/plat/common.h @@ -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); -- 2.9.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Tue, 6 Sep 2016 16:06:20 +0200 Subject: [PATCH 1/4] ARM: mv78xx0: simplify ethernet device creation Message-ID: <20160906140623.2853066-1-arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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: Arnd Bergmann --- arch/arm/mach-mv78xx0/common.c | 9 ++------- arch/arm/plat-orion/common.c | 7 ++----- arch/arm/plat-orion/include/plat/common.h | 7 ++----- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index 6af5430d0d97..f72e1e9f5fc5 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c @@ -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); } /***************************************************************************** diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 78c8bf4043c0..7757f71fe709 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -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); diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h index 9e6d76ad48a9..8519727faa5e 100644 --- a/arch/arm/plat-orion/include/plat/common.h +++ b/arch/arm/plat-orion/include/plat/common.h @@ -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); -- 2.9.0