GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 07:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] ibmtr probe is __devinit, not __init

Browse source 
used by ->attach() in pcmcia analog

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2007-03-14 09:04:21 +00:00 • committed by Linus Torvalds
parent 04ff97086b
commit abf0437b42
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/pcmcia/ibmtr_cs.c
View file

@ -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; ibmtr_dev_t *info;
struct net_device *dev; struct net_device *dev;
@ -217,7 +217,7 @@ static void ibmtr_detach(struct pcmcia_device *link)
#define CS_CHECK(fn, ret) \ #define CS_CHECK(fn, ret) \
do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) 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; ibmtr_dev_t *info = link->priv;
struct net_device *dev = info->dev; struct net_device *dev = info->dev;

4
drivers/net/tokenring/ibmtr.c
View file

@ -346,7 +346,7 @@ static void ibmtr_cleanup_card(struct net_device *dev)
* which references it. * which references it.
****************************************************************************/ ****************************************************************************/
static int __init ibmtr_probe(struct net_device *dev) static int __devinit ibmtr_probe(struct net_device *dev)
{ {
int i; int i;
int base_addr = dev->base_addr; int base_addr = dev->base_addr;
@ -366,7 +366,7 @@ static int __init ibmtr_probe(struct net_device *dev)
return -ENODEV; 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); int err = ibmtr_probe(dev);
if (!err) { if (!err) {