net: sun4i-emac: remove erroneous assignment

PATCH Applied Arnd Bergmann 4 participants 4 messages Jun 3, 2013 – Jun 5, 2013

Subsystems (3)

Networking Network drivers Arm/Allwinner sunXi SoC support

lore

Share & tools

lore

Arnd Bergmann

author

2013-06-03 21:36 UTC #0 lore raw

PATCH 1/1 net: sun4i-emac: remove erroneous assignment

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 <[email protected]>

Cc Stefan Roese <[email protected]>

Cc Maxime Ripard <[email protected]>

Cc Richard Genoud <[email protected]>

---

drivers/net/ethernet/allwinner/sun4i-emac.c +0 -4

index b411344..3e7b220 100644
@@ -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 */

Stefan Roese

Acked-by on v1 1/1

2013-06-04 05:52 UTC #1 lore raw

Quoted 5 lines · 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!

Quoted 7 lines

The correct assignment is present as well, so we just need to remove the wrong one.
Signed-off-by Arnd Bergmann <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Richard Genoud <[email protected]>

Thanks for fixing this:

Acked-by Stefan Roese <[email protected]>

Thanks,
Stefan

Maxime Ripard

Acked-by on v1 1/1

2013-06-04 13:40 UTC #2 lore raw

In reply to Arnd Bergmann

Hi Arnd,

Quoted 7 lines · 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.

Thanks for fixing this,

Acked-by Maxime Ripard <[email protected]>

Maxime

David Miller

maintainer Applied

2013-06-05 00:34 UTC #3 lore raw

From: Maxime Ripard <[email protected]>
Date: Tue, 4 Jun 2013 15:40:34 +0200

Quoted 11 lines · Arnd Bergmann

Quoted 7 lines
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 <[email protected]>

Applied.