From: Arnd Bergmann <arnd@arndb.de>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Stefan Roese <sr@denx.de>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Richard Genoud <richard.genoud@gmail.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH] net: sun4i-emac: remove erroneous assignment
Date: Mon, 03 Jun 2013 23:36:50 +0200 [thread overview]
Message-ID: <3298610.K0DeJZEM4E@wuerfel> (raw)
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 */
next reply other threads:[~2013-06-03 21:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-03 21:36 Arnd Bergmann [this message]
2013-06-04 5:52 ` [PATCH] net: sun4i-emac: remove erroneous assignment Stefan Roese
2013-06-04 13:40 ` Maxime Ripard
2013-06-05 0:34 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3298610.K0DeJZEM4E@wuerfel \
--to=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=netdev@vger.kernel.org \
--cc=richard.genoud@gmail.com \
--cc=sr@denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox