ibmtr probe is __devinit, not __init
PATCH 1/13 ibmtr probe is __devinit, not __init
used by ->attach() in pcmcia analog
Signed-off-by Al Viro <[email protected]>
--- drivers/net/pcmcia/ibmtr_cs.c | 4 ++-- drivers/net/tokenring/ibmtr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/pcmcia/ibmtr_cs.c +2 -2
@@ -138,7 +138,7 @@ static const struct ethtool_ops netdev_ethtool_ops = {======================================================================*/ -static int ibmtr_attach (struct pcmcia_device *link) +static int __devinit ibmtr_attach (struct pcmcia_device *link) {ibmtr_dev_t *info;struct net_device *dev;
@@ -217,7 +217,7 @@ static void ibmtr_detach(struct pcmcia_device *link)#define CS_CHECK (fn, ret) \ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) -static int ibmtr_config (struct pcmcia_device *link) +static int __devinit ibmtr_config (struct pcmcia_device *link) {ibmtr_dev_t *info = link->priv;struct net_device *dev = info->dev;
drivers/net/tokenring/ibmtr.c +2 -2
@@ -346,7 +346,7 @@ static void ibmtr_cleanup_card(struct net_device *dev)* which references it. ****************************************************************************/ -static int __init ibmtr_probe (struct net_device *dev) +static int __devinit ibmtr_probe (struct net_device *dev) {int i;int base_addr = dev->base_addr;
@@ -366,7 +366,7 @@ static int __init ibmtr_probe(struct net_device *dev)return -ENODEV ; } -int __init ibmtr_probe_card (struct net_device *dev) +int __devinit ibmtr_probe_card (struct net_device *dev) {int err =ibmtr_probe (dev);if (!err) {
Signature · 1 line
1.5.0-rc2.GIT
Quoted 7 lines · Al Viro
used by ->attach() in pcmcia analog
Signed-off-by Al Viro <[email protected]>--- drivers/net/pcmcia/ibmtr_cs.c | 4 ++-- drivers/net/tokenring/ibmtr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
ACK