[PATCH] net: sun4i-emac: remove erroneous assignment

[PATCH] net: sun4i-emac: remove erroneous assignment

[Arnd Bergmann]

The newly added sun4i-emac driver causes a build error when
CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
assign a pointer to netdev->poll_controller, which has
been replaced with ops->ndo_poll_controller in 2.6.31!

The correct assignment is present as well, so we just need
to remove the wrong one.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Stefan Roese <sr@denx.de>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Richard Genoud <richard.genoud@gmail.com>
---
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index b411344..3e7b220 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -869,10 +869,6 @@ static int emac_probe(struct platform_device *pdev)
 	ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
 	ndev->ethtool_ops = &emac_ethtool_ops;
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-	ndev->poll_controller = &emac_poll_controller;
-#endif
-
 	platform_set_drvdata(pdev, ndev);
 
 	/* Carrier starts down, phylib will bring it up */

Re: [PATCH] net: sun4i-emac: remove erroneous assignment

[Stefan Roese]

On 06/03/2013 11:36 PM, Arnd Bergmann wrote:
> The newly added sun4i-emac driver causes a build error when
> CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
> assign a pointer to netdev->poll_controller, which has
> been replaced with ops->ndo_poll_controller in 2.6.31!
> 
> The correct assignment is present as well, so we just need
> to remove the wrong one.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Stefan Roese <sr@denx.de>
> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Richard Genoud <richard.genoud@gmail.com>

Thanks for fixing this:

Acked-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

Re: [PATCH] net: sun4i-emac: remove erroneous assignment

[Maxime Ripard]

Hi Arnd,

On Mon, Jun 03, 2013 at 11:36:50PM +0200, Arnd Bergmann wrote:
> The newly added sun4i-emac driver causes a build error when
> CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
> assign a pointer to netdev->poll_controller, which has
> been replaced with ops->ndo_poll_controller in 2.6.31!
> 
> The correct assignment is present as well, so we just need
> to remove the wrong one.

Thanks for fixing this,
Acked-by: Maxime Ripard <maxime.ripard@anandra.org>

Maxime

Re: [PATCH] net: sun4i-emac: remove erroneous assignment

[David Miller]

From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 4 Jun 2013 15:40:34 +0200

> On Mon, Jun 03, 2013 at 11:36:50PM +0200, Arnd Bergmann wrote:
>> The newly added sun4i-emac driver causes a build error when
>> CONFIG_NET_POLL_CONTROLLER is set, because it attempts to
>> assign a pointer to netdev->poll_controller, which has
>> been replaced with ops->ndo_poll_controller in 2.6.31!
>> 
>> The correct assignment is present as well, so we just need
>> to remove the wrong one.
> 
> Thanks for fixing this,
> Acked-by: Maxime Ripard <maxime.ripard@anandra.org>

Applied.