Commit 2e76baea authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by David S. Miller

net: move jazzsonic's probe function to .devinit.text

A pointer to jazz_sonic_probe is passed to the core via
platform_driver_register and so the function must not disappear when the
.init sections are discarded.  Otherwise (if also having HOTPLUG=y)
unbinding and binding a device to the driver via sysfs will result in an
oops as does a device being registered late.

As noticed by Geert Uytterhoeven sonic_probe1 is called by
jazz_sonic_probe, so the former has to move to .devinit.text, too.

An alternative to this patch is using platform_driver_probe instead of
platform_driver_register plus removing the pointer to the probe function
from the struct platform_driver.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Finn Thain <fthain@telegraphics.com.au>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: netdev@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a65a6881
...@@ -108,7 +108,7 @@ static const struct net_device_ops sonic_netdev_ops = { ...@@ -108,7 +108,7 @@ static const struct net_device_ops sonic_netdev_ops = {
.ndo_set_mac_address = eth_mac_addr, .ndo_set_mac_address = eth_mac_addr,
}; };
static int __init sonic_probe1(struct net_device *dev) static int __devinit sonic_probe1(struct net_device *dev)
{ {
static unsigned version_printed; static unsigned version_printed;
unsigned int silicon_revision; unsigned int silicon_revision;
...@@ -211,7 +211,7 @@ static int __init sonic_probe1(struct net_device *dev) ...@@ -211,7 +211,7 @@ static int __init sonic_probe1(struct net_device *dev)
* Probe for a SONIC ethernet controller on a Mips Jazz board. * Probe for a SONIC ethernet controller on a Mips Jazz board.
* Actually probing is superfluous but we're paranoid. * Actually probing is superfluous but we're paranoid.
*/ */
static int __init jazz_sonic_probe(struct platform_device *pdev) static int __devinit jazz_sonic_probe(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct sonic_local *lp; struct sonic_local *lp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment