2013-06-03 21:36:49

by Arnd Bergmann

Subject: [PATCH] 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]>
---
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 */

2013-06-04 05:58:49

by Stefan Roese

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

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 <[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

2013-06-04 13:40:41

by Maxime Ripard

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

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

Maxime

2013-06-05 00:34:28

by David Miller

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

From: Maxime Ripard <[email protected]>
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 <[email protected]>

Applied.