Commit a07d8ecf authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

ethernet: isa: convert to module_init/module_exit 



There are a couple of ISA ethernet drivers that use the old
init_module/cleanup_module function names for the main entry
points, nothing else uses those any more.

Change them to the documented method with module_init()
and module_exit() markers next to static functions.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d52c1069

drivers/net/ethernet/3com/3c515.c

+2 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ MODULE_PARM_DESC(max_interrupt_work, "3c515 maximum events handled per interrupt 
/* we will need locking (and refcounting) if we ever use it for more */

static LIST_HEAD(root_corkscrew_dev);



int init_module(void)

static int corkscrew_init_module(void)

{

	int found = 0;

	if (debug >= 0)
@@ -416,6 +416,7 @@ int init_module(void) 
		found++;

	return found ? 0 : -ENODEV;

}

module_init(corkscrew_init_module);



#else

struct net_device *tc515_probe(int unit)

drivers/net/ethernet/8390/ne.c

+2 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ static void __init ne_add_devices(void) 
}



#ifdef MODULE

int __init init_module(void)

static int __init ne_init(void)

{

	int retval;

	ne_add_devices();
@@ -940,6 +940,7 @@ int __init init_module(void) 
	ne_loop_rm_unreg(0);

	return retval;

}

module_init(ne_init);

#else /* MODULE */

static int __init ne_init(void)

{

drivers/net/ethernet/8390/smc-ultra.c

+4 −5
Original line number Diff line number Diff line
@@ -522,7 +522,6 @@ static void ultra_pio_input(struct net_device *dev, int count, 
	/* We know skbuffs are padded to at least word alignment. */

	insw(ioaddr + IOPD, buf, (count+1)>>1);

}



static void ultra_pio_output(struct net_device *dev, int count,

							const unsigned char *buf, const int start_page)

{
@@ -572,8 +571,7 @@ MODULE_LICENSE("GPL"); 


/* This is set up so that only a single autoprobe takes place per call.

ISA device autoprobes on a running machine are not recommended. */

int __init

init_module(void)

static int __init ultra_init_module(void)

{

	struct net_device *dev;

	int this_dev, found = 0;
@@ -600,6 +598,7 @@ init_module(void) 
		return 0;

	return -ENXIO;

}

module_init(ultra_init_module);



static void cleanup_card(struct net_device *dev)

{
@@ -613,8 +612,7 @@ static void cleanup_card(struct net_device *dev) 
	iounmap(ei_status.mem);

}



void __exit

cleanup_module(void)

static void __exit ultra_cleanup_module(void)

{

	int this_dev;
@@ -627,4 +625,5 @@ cleanup_module(void) 
		}

	}

}

module_exit(ultra_cleanup_module);

#endif /* MODULE */

drivers/net/ethernet/8390/wd.c

+4 −3
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ MODULE_LICENSE("GPL"); 
/* This is set up so that only a single autoprobe takes place per call.

ISA device autoprobes on a running machine are not recommended. */



int __init init_module(void)

static int __init wd_init_module(void)

{

	struct net_device *dev;

	int this_dev, found = 0;
@@ -548,6 +548,7 @@ int __init init_module(void) 
		return 0;

	return -ENXIO;

}

module_init(wd_init_module);



static void cleanup_card(struct net_device *dev)

{
@@ -556,8 +557,7 @@ static void cleanup_card(struct net_device *dev) 
	iounmap(ei_status.mem);

}



void __exit

cleanup_module(void)

static void __exit wd_cleanup_module(void)

{

	int this_dev;
@@ -570,4 +570,5 @@ cleanup_module(void) 
		}

	}

}

module_exit(wd_cleanup_module);

#endif /* MODULE */

drivers/net/ethernet/amd/lance.c

+4 −2
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)"); 
MODULE_PARM_DESC(irq, "LANCE/PCnet IRQ number (ignored for some devices)");

MODULE_PARM_DESC(lance_debug, "LANCE/PCnet debug level (0-7)");



int __init init_module(void)

static int __init lance_init_module(void)

{

	struct net_device *dev;

	int this_dev, found = 0;
@@ -356,6 +356,7 @@ int __init init_module(void) 
		return 0;

	return -ENXIO;

}

module_init(lance_init_module);



static void cleanup_card(struct net_device *dev)

{
@@ -368,7 +369,7 @@ static void cleanup_card(struct net_device *dev) 
	kfree(lp);

}



void __exit cleanup_module(void)

static void __exit lance_cleanup_module(void)

{

	int this_dev;
@@ -381,6 +382,7 @@ void __exit cleanup_module(void) 
		}

	}

}

module_exit(lance_cleanup_module);

#endif /* MODULE */

MODULE_LICENSE("GPL");