* [PATCH] net: sun4i-emac: remove erroneous assignment
@ 2013-06-03 21:36 Arnd Bergmann
2013-06-04 5:52 ` Stefan Roese
2013-06-04 13:40 ` Maxime Ripard
0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2013-06-03 21:36 UTC (permalink / raw)
To: netdev
Cc: linux-kernel, Stefan Roese, Maxime Ripard, Richard Genoud,
David S. Miller
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 */
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net: sun4i-emac: remove erroneous assignment
2013-06-03 21:36 [PATCH] net: sun4i-emac: remove erroneous assignment Arnd Bergmann
@ 2013-06-04 5:52 ` Stefan Roese
2013-06-04 13:40 ` Maxime Ripard
1 sibling, 0 replies; 4+ messages in thread
From: Stefan Roese @ 2013-06-04 5:52 UTC (permalink / raw)
To: Arnd Bergmann
Cc: netdev, linux-kernel, Maxime Ripard, Richard Genoud,
David S. Miller
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: sun4i-emac: remove erroneous assignment
2013-06-03 21:36 [PATCH] net: sun4i-emac: remove erroneous assignment Arnd Bergmann
2013-06-04 5:52 ` Stefan Roese
@ 2013-06-04 13:40 ` Maxime Ripard
2013-06-05 0:34 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Maxime Ripard @ 2013-06-04 13:40 UTC (permalink / raw)
To: Arnd Bergmann
Cc: netdev, linux-kernel, Stefan Roese, Richard Genoud,
David S. Miller
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: sun4i-emac: remove erroneous assignment
2013-06-04 13:40 ` Maxime Ripard
@ 2013-06-05 0:34 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-06-05 0:34 UTC (permalink / raw)
To: maxime.ripard; +Cc: arnd, netdev, linux-kernel, sr, richard.genoud
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-06-05 0:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-03 21:36 [PATCH] net: sun4i-emac: remove erroneous assignment Arnd Bergmann
2013-06-04 5:52 ` Stefan Roese
2013-06-04 13:40 ` Maxime Ripard
2013-06-05 0:34 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).