diff mbox series

[net-next,v2,5/6] net: cpmac: remove driver to prepare for platform removal

Message ID 20230922061530.3121-6-wsa+renesas@sang-engineering.com (mailing list archive)
State Handled Elsewhere
Headers show
Series remove AR7 platform and associated drivers | expand

Commit Message

Wolfram Sang Sept. 22, 2023, 6:15 a.m. UTC
AR7 is going to be removed from the Kernel, so remove its networking
support in form of the cpmac driver. This allows us to remove the
platform because this driver includes a platform specific header.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes since v1:
* added ack

 MAINTAINERS                      |    6 -
 drivers/net/ethernet/ti/Kconfig  |    9 +-
 drivers/net/ethernet/ti/Makefile |    1 -
 drivers/net/ethernet/ti/cpmac.c  | 1251 ------------------------------
 4 files changed, 1 insertion(+), 1266 deletions(-)
 delete mode 100644 drivers/net/ethernet/ti/cpmac.c

Comments

Thomas Bogendoerfer Oct. 5, 2023, 2:08 p.m. UTC | #1
On Fri, Sep 22, 2023 at 08:15:26AM +0200, Wolfram Sang wrote:
> AR7 is going to be removed from the Kernel, so remove its networking
> support in form of the cpmac driver. This allows us to remove the
> platform because this driver includes a platform specific header.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> Changes since v1:
> * added ack
> 
>  MAINTAINERS                      |    6 -
>  drivers/net/ethernet/ti/Kconfig  |    9 +-
>  drivers/net/ethernet/ti/Makefile |    1 -
>  drivers/net/ethernet/ti/cpmac.c  | 1251 ------------------------------
>  4 files changed, 1 insertion(+), 1266 deletions(-)
>  delete mode 100644 drivers/net/ethernet/ti/cpmac.c
> [..]

is it ok for network people to route this patch via mips-next tree
or do you want to apply to net-next ?

Thomas.
Jakub Kicinski Oct. 5, 2023, 2:16 p.m. UTC | #2
On Thu, 5 Oct 2023 16:08:55 +0200 Thomas Bogendoerfer wrote:
> On Fri, Sep 22, 2023 at 08:15:26AM +0200, Wolfram Sang wrote:
> > AR7 is going to be removed from the Kernel, so remove its networking
> > support in form of the cpmac driver. This allows us to remove the
> > platform because this driver includes a platform specific header.
> > 
> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> > ---
> > Changes since v1:
> > * added ack
> > 
> >  MAINTAINERS                      |    6 -
> >  drivers/net/ethernet/ti/Kconfig  |    9 +-
> >  drivers/net/ethernet/ti/Makefile |    1 -
> >  drivers/net/ethernet/ti/cpmac.c  | 1251 ------------------------------
> >  4 files changed, 1 insertion(+), 1266 deletions(-)
> >  delete mode 100644 drivers/net/ethernet/ti/cpmac.c
> > [..]  
> 
> is it ok for network people to route this patch via mips-next tree
> or do you want to apply to net-next ?

We have a ".remove callback should return void" conversion from Uwe
queued for the deleted driver (231ea972ccaf5b). The conflict will be
really trivial, but I guess no conflict beats trivial conflict so better
if we take it? :S
Thomas Bogendoerfer Oct. 5, 2023, 7:07 p.m. UTC | #3
On Thu, Oct 05, 2023 at 07:16:34AM -0700, Jakub Kicinski wrote:
> On Thu, 5 Oct 2023 16:08:55 +0200 Thomas Bogendoerfer wrote:
> > On Fri, Sep 22, 2023 at 08:15:26AM +0200, Wolfram Sang wrote:
> > > AR7 is going to be removed from the Kernel, so remove its networking
> > > support in form of the cpmac driver. This allows us to remove the
> > > platform because this driver includes a platform specific header.
> > > 
> > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> > > Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> > > ---
> > > Changes since v1:
> > > * added ack
> > > 
> > >  MAINTAINERS                      |    6 -
> > >  drivers/net/ethernet/ti/Kconfig  |    9 +-
> > >  drivers/net/ethernet/ti/Makefile |    1 -
> > >  drivers/net/ethernet/ti/cpmac.c  | 1251 ------------------------------
> > >  4 files changed, 1 insertion(+), 1266 deletions(-)
> > >  delete mode 100644 drivers/net/ethernet/ti/cpmac.c
> > > [..]  
> > 
> > is it ok for network people to route this patch via mips-next tree
> > or do you want to apply to net-next ?
> 
> We have a ".remove callback should return void" conversion from Uwe
> queued for the deleted driver (231ea972ccaf5b). The conflict will be
> really trivial, but I guess no conflict beats trivial conflict so better
> if we take it? :S

makes sense, so I'll just apply the other patches.

Thomas.
Jakub Kicinski Oct. 6, 2023, 2:26 p.m. UTC | #4
On Fri, 22 Sep 2023 08:15:26 +0200 Wolfram Sang wrote:
> AR7 is going to be removed from the Kernel, so remove its networking
> support in form of the cpmac driver. This allows us to remove the
> platform because this driver includes a platform specific header.
> 
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>

Applied to net-next (98bdeae9502b), thanks!
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index bdd6e7ce962d..00063d14c70b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5309,12 +5309,6 @@  M:	Bence Csókás <bence98@sch.bme.hu>
 S:	Maintained
 F:	drivers/i2c/busses/i2c-cp2615.c
 
-CPMAC ETHERNET DRIVER
-M:	Florian Fainelli <f.fainelli@gmail.com>
-L:	netdev@vger.kernel.org
-S:	Maintained
-F:	drivers/net/ethernet/ti/cpmac.c
-
 CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
 M:	Viresh Kumar <viresh.kumar@linaro.org>
 M:	Sudeep Holla <sudeep.holla@arm.com>
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index 88b5b1b47779..7a99a86888e9 100644
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -6,7 +6,7 @@ 
 config NET_VENDOR_TI
 	bool "Texas Instruments (TI) devices"
 	default y
-	depends on PCI || EISA || AR7 || ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3
+	depends on PCI || EISA || ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3
 	help
 	  If you have a network (Ethernet) card belonging to this class, say Y.
 
@@ -176,13 +176,6 @@  config TLAN
 
 	  Please email feedback to <torben.mathiasen@compaq.com>.
 
-config CPMAC
-	tristate "TI AR7 CPMAC Ethernet support"
-	depends on AR7
-	select PHYLIB
-	help
-	  TI AR7 CPMAC Ethernet support
-
 config TI_ICSSG_PRUETH
 	tristate "TI Gigabit PRU Ethernet driver"
 	select PHYLIB
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile
index 34fd7a716ba6..e38ec9d6c99b 100644
--- a/drivers/net/ethernet/ti/Makefile
+++ b/drivers/net/ethernet/ti/Makefile
@@ -8,7 +8,6 @@  obj-$(CONFIG_TI_DAVINCI_EMAC) += cpsw-common.o
 obj-$(CONFIG_TI_CPSW_SWITCHDEV) += cpsw-common.o
 
 obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_TI_DAVINCI_EMAC) += ti_davinci_emac.o
 ti_davinci_emac-y := davinci_emac.o davinci_cpdma.o
 obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
deleted file mode 100644
index 80eeeb463c4f..000000000000