Commit 64916f1e authored by Denis Vlasenko's avatar Denis Vlasenko Committed by Jeff Garzik
Browse files

[PATCH] fix a few "warning: 'cleanup_card' defined but not used" 



These warnings are emitted if non-modular network drivers are built.
Fixes just move cleanup_card() definitions into #ifdef MODULE region.

/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/wd.c:131: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/3c503.c:152: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/ne.c:216: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/hp.c:106: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/hp-plus.c:142: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/smc-ultra.c:172: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/e2100.c:144: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/es3210.c:159: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/lne390.c:149: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/lance.c:313: warning: 'cleanup_card' defined but not used
/.1/usr/srcdevel/kernel/linux-2.6.15-rc7.src/drivers/net/ac3200.c:127: warning: 'cleanup_card' defined but not used

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent fa45459e

drivers/net/3c503.c

+8 −8
Original line number Diff line number Diff line
@@ -148,14 +148,6 @@ el2_pio_probe(struct net_device *dev) 
    return -ENODEV;

}



static void cleanup_card(struct net_device *dev)

{

	/* NB: el2_close() handles free_irq */

	release_region(dev->base_addr, EL2_IO_EXTENT);

	if (ei_status.mem)

		iounmap(ei_status.mem);

}



#ifndef MODULE

struct net_device * __init el2_probe(int unit)

{
@@ -726,6 +718,14 @@ init_module(void) 
	return -ENXIO;

}



static void cleanup_card(struct net_device *dev)

{

	/* NB: el2_close() handles free_irq */

	release_region(dev->base_addr, EL2_IO_EXTENT);

	if (ei_status.mem)

		iounmap(ei_status.mem);

}



void

cleanup_module(void)

{

drivers/net/ac3200.c

+8 −8
Original line number Diff line number Diff line
@@ -123,14 +123,6 @@ static int __init do_ac3200_probe(struct net_device *dev) 
	return -ENODEV;

}



static void cleanup_card(struct net_device *dev)

{

	/* Someday free_irq may be in ac_close_card() */

	free_irq(dev->irq, dev);

	release_region(dev->base_addr, AC_IO_EXTENT);

	iounmap(ei_status.mem);

}



#ifndef MODULE

struct net_device * __init ac3200_probe(int unit)

{
@@ -406,6 +398,14 @@ init_module(void) 
	return -ENXIO;

}



static void cleanup_card(struct net_device *dev)

{

	/* Someday free_irq may be in ac_close_card() */

	free_irq(dev->irq, dev);

	release_region(dev->base_addr, AC_IO_EXTENT);

	iounmap(ei_status.mem);

}



void

cleanup_module(void)

{

drivers/net/e2100.c

+7 −7
Original line number Diff line number Diff line
@@ -140,13 +140,6 @@ static int __init do_e2100_probe(struct net_device *dev) 
	return -ENODEV;

}



static void cleanup_card(struct net_device *dev)

{

	/* NB: e21_close() handles free_irq */

	iounmap(ei_status.mem);

	release_region(dev->base_addr, E21_IO_EXTENT);

}



#ifndef MODULE

struct net_device * __init e2100_probe(int unit)

{
@@ -463,6 +456,13 @@ init_module(void) 
	return -ENXIO;

}



static void cleanup_card(struct net_device *dev)

{

	/* NB: e21_close() handles free_irq */

	iounmap(ei_status.mem);

	release_region(dev->base_addr, E21_IO_EXTENT);

}



void

cleanup_module(void)

{

drivers/net/es3210.c

+7 −7
Original line number Diff line number Diff line
@@ -155,13 +155,6 @@ static int __init do_es_probe(struct net_device *dev) 
	return -ENODEV;

}



static void cleanup_card(struct net_device *dev)

{

	free_irq(dev->irq, dev);

	release_region(dev->base_addr, ES_IO_EXTENT);

	iounmap(ei_status.mem);

}



#ifndef MODULE

struct net_device * __init es_probe(int unit)

{
@@ -456,6 +449,13 @@ init_module(void) 
	return -ENXIO;

}



static void cleanup_card(struct net_device *dev)

{

	free_irq(dev->irq, dev);

	release_region(dev->base_addr, ES_IO_EXTENT);

	iounmap(ei_status.mem);

}



void

cleanup_module(void)

{

drivers/net/hp-plus.c

+6 −6
Original line number Diff line number Diff line
@@ -138,12 +138,6 @@ static int __init do_hpp_probe(struct net_device *dev) 
	return -ENODEV;

}



static void cleanup_card(struct net_device *dev)

{

	/* NB: hpp_close() handles free_irq */

	release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);

}



#ifndef MODULE

struct net_device * __init hp_plus_probe(int unit)

{
@@ -473,6 +467,12 @@ init_module(void) 
	return -ENXIO;

}



static void cleanup_card(struct net_device *dev)

{

	/* NB: hpp_close() handles free_irq */

	release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);

}



void

cleanup_module(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE