commit 64916f1ebe93592153c72bcdb189a31e4d40049a

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

[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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

authored by

Denis Vlasenko and committed by

Jeff Garzik 20 years ago 64916f1e fa45459e

+96 -96

12 changed files

expand all

unified split

drivers

net

3c503.c

ac3200.c

e2100.c

es3210.c

hp-plus.c

hp.c

lance.c

lne390.c

ne.c

ne2.c

smc-ultra.c

wd.c

+8 -8

drivers/net/3c503.c

··· 148 148 return -ENODEV; 149 149 } 150 150 151 - static void cleanup_card(struct net_device *dev) 152 - { 153 - /* NB: el2_close() handles free_irq */ 154 - release_region(dev->base_addr, EL2_IO_EXTENT); 155 - if (ei_status.mem) 156 - iounmap(ei_status.mem); 157 - } 158 - 159 151 #ifndef MODULE 160 152 struct net_device * __init el2_probe(int unit) 161 153 { ··· 716 724 if (found) 717 725 return 0; 718 726 return -ENXIO; 727 + } 728 + 729 + static void cleanup_card(struct net_device *dev) 730 + { 731 + /* NB: el2_close() handles free_irq */ 732 + release_region(dev->base_addr, EL2_IO_EXTENT); 733 + if (ei_status.mem) 734 + iounmap(ei_status.mem); 719 735 } 720 736 721 737 void

+8 -8

drivers/net/ac3200.c

··· 123 123 return -ENODEV; 124 124 } 125 125 126 - static void cleanup_card(struct net_device *dev) 127 - { 128 - /* Someday free_irq may be in ac_close_card() */ 129 - free_irq(dev->irq, dev); 130 - release_region(dev->base_addr, AC_IO_EXTENT); 131 - iounmap(ei_status.mem); 132 - } 133 - 134 126 #ifndef MODULE 135 127 struct net_device * __init ac3200_probe(int unit) 136 128 { ··· 396 404 if (found) 397 405 return 0; 398 406 return -ENXIO; 407 + } 408 + 409 + static void cleanup_card(struct net_device *dev) 410 + { 411 + /* Someday free_irq may be in ac_close_card() */ 412 + free_irq(dev->irq, dev); 413 + release_region(dev->base_addr, AC_IO_EXTENT); 414 + iounmap(ei_status.mem); 399 415 } 400 416 401 417 void

+7 -7

drivers/net/e2100.c

··· 140 140 return -ENODEV; 141 141 } 142 142 143 - static void cleanup_card(struct net_device *dev) 144 - { 145 - /* NB: e21_close() handles free_irq */ 146 - iounmap(ei_status.mem); 147 - release_region(dev->base_addr, E21_IO_EXTENT); 148 - } 149 - 150 143 #ifndef MODULE 151 144 struct net_device * __init e2100_probe(int unit) 152 145 { ··· 454 461 if (found) 455 462 return 0; 456 463 return -ENXIO; 464 + } 465 + 466 + static void cleanup_card(struct net_device *dev) 467 + { 468 + /* NB: e21_close() handles free_irq */ 469 + iounmap(ei_status.mem); 470 + release_region(dev->base_addr, E21_IO_EXTENT); 457 471 } 458 472 459 473 void

+7 -7

drivers/net/es3210.c

··· 155 155 return -ENODEV; 156 156 } 157 157 158 - static void cleanup_card(struct net_device *dev) 159 - { 160 - free_irq(dev->irq, dev); 161 - release_region(dev->base_addr, ES_IO_EXTENT); 162 - iounmap(ei_status.mem); 163 - } 164 - 165 158 #ifndef MODULE 166 159 struct net_device * __init es_probe(int unit) 167 160 { ··· 447 454 if (found) 448 455 return 0; 449 456 return -ENXIO; 457 + } 458 + 459 + static void cleanup_card(struct net_device *dev) 460 + { 461 + free_irq(dev->irq, dev); 462 + release_region(dev->base_addr, ES_IO_EXTENT); 463 + iounmap(ei_status.mem); 450 464 } 451 465 452 466 void

+6 -6

drivers/net/hp-plus.c

··· 138 138 return -ENODEV; 139 139 } 140 140 141 - static void cleanup_card(struct net_device *dev) 142 - { 143 - /* NB: hpp_close() handles free_irq */ 144 - release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT); 145 - } 146 - 147 141 #ifndef MODULE 148 142 struct net_device * __init hp_plus_probe(int unit) 149 143 { ··· 465 471 if (found) 466 472 return 0; 467 473 return -ENXIO; 474 + } 475 + 476 + static void cleanup_card(struct net_device *dev) 477 + { 478 + /* NB: hpp_close() handles free_irq */ 479 + release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT); 468 480 } 469 481 470 482 void

+6 -6

drivers/net/hp.c

··· 102 102 return -ENODEV; 103 103 } 104 104 105 - static void cleanup_card(struct net_device *dev) 106 - { 107 - free_irq(dev->irq, dev); 108 - release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT); 109 - } 110 - 111 105 #ifndef MODULE 112 106 struct net_device * __init hp_probe(int unit) 113 107 { ··· 436 442 if (found) 437 443 return 0; 438 444 return -ENXIO; 445 + } 446 + 447 + static void cleanup_card(struct net_device *dev) 448 + { 449 + free_irq(dev->irq, dev); 450 + release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT); 439 451 } 440 452 441 453 void

+11 -11

drivers/net/lance.c

··· 309 309 310 310 311 311 312 - static void cleanup_card(struct net_device *dev) 313 - { 314 - struct lance_private *lp = dev->priv; 315 - if (dev->dma != 4) 316 - free_dma(dev->dma); 317 - release_region(dev->base_addr, LANCE_TOTAL_SIZE); 318 - kfree(lp->tx_bounce_buffs); 319 - kfree((void*)lp->rx_buffs); 320 - kfree(lp); 321 - } 322 - 323 312 #ifdef MODULE 324 313 #define MAX_CARDS 8 /* Max number of interfaces (cards) per module */ 325 314 ··· 354 365 if (found != 0) 355 366 return 0; 356 367 return -ENXIO; 368 + } 369 + 370 + static void cleanup_card(struct net_device *dev) 371 + { 372 + struct lance_private *lp = dev->priv; 373 + if (dev->dma != 4) 374 + free_dma(dev->dma); 375 + release_region(dev->base_addr, LANCE_TOTAL_SIZE); 376 + kfree(lp->tx_bounce_buffs); 377 + kfree((void*)lp->rx_buffs); 378 + kfree(lp); 357 379 } 358 380 359 381 void cleanup_module(void)

+7 -7

drivers/net/lne390.c

··· 145 145 return -ENODEV; 146 146 } 147 147 148 - static void cleanup_card(struct net_device *dev) 149 - { 150 - free_irq(dev->irq, dev); 151 - release_region(dev->base_addr, LNE390_IO_EXTENT); 152 - iounmap(ei_status.mem); 153 - } 154 - 155 148 #ifndef MODULE 156 149 struct net_device * __init lne390_probe(int unit) 157 150 { ··· 431 438 if (found) 432 439 return 0; 433 440 return -ENXIO; 441 + } 442 + 443 + static void cleanup_card(struct net_device *dev) 444 + { 445 + free_irq(dev->irq, dev); 446 + release_region(dev->base_addr, LNE390_IO_EXTENT); 447 + iounmap(ei_status.mem); 434 448 } 435 449 436 450 void cleanup_module(void)

+9 -9

drivers/net/ne.c

··· 212 212 return -ENODEV; 213 213 } 214 214 215 - static void cleanup_card(struct net_device *dev) 216 - { 217 - struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; 218 - if (idev) 219 - pnp_device_detach(idev); 220 - free_irq(dev->irq, dev); 221 - release_region(dev->base_addr, NE_IO_EXTENT); 222 - } 223 - 224 215 #ifndef MODULE 225 216 struct net_device * __init ne_probe(int unit) 226 217 { ··· 848 857 if (found) 849 858 return 0; 850 859 return -ENODEV; 860 + } 861 + 862 + static void cleanup_card(struct net_device *dev) 863 + { 864 + struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; 865 + if (idev) 866 + pnp_device_detach(idev); 867 + free_irq(dev->irq, dev); 868 + release_region(dev->base_addr, NE_IO_EXTENT); 851 869 } 852 870 853 871 void cleanup_module(void)

+8 -8

drivers/net/ne2.c

··· 278 278 return -ENODEV; 279 279 } 280 280 281 - static void cleanup_card(struct net_device *dev) 282 - { 283 - mca_mark_as_unused(ei_status.priv); 284 - mca_set_adapter_procfn( ei_status.priv, NULL, NULL); 285 - free_irq(dev->irq, dev); 286 - release_region(dev->base_addr, NE_IO_EXTENT); 287 - } 288 - 289 281 #ifndef MODULE 290 282 struct net_device * __init ne2_probe(int unit) 291 283 { ··· 802 810 return 0; 803 811 printk(KERN_WARNING "ne2.c: No NE/2 card found\n"); 804 812 return -ENXIO; 813 + } 814 + 815 + static void cleanup_card(struct net_device *dev) 816 + { 817 + mca_mark_as_unused(ei_status.priv); 818 + mca_set_adapter_procfn( ei_status.priv, NULL, NULL); 819 + free_irq(dev->irq, dev); 820 + release_region(dev->base_addr, NE_IO_EXTENT); 805 821 } 806 822 807 823 void cleanup_module(void)

+12 -12

drivers/net/smc-ultra.c

··· 168 168 return -ENODEV; 169 169 } 170 170 171 - static void cleanup_card(struct net_device *dev) 172 - { 173 - /* NB: ultra_close_card() does free_irq */ 174 - #ifdef __ISAPNP__ 175 - struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; 176 - if (idev) 177 - pnp_device_detach(idev); 178 - #endif 179 - release_region(dev->base_addr - ULTRA_NIC_OFFSET, ULTRA_IO_EXTENT); 180 - iounmap(ei_status.mem); 181 - } 182 - 183 171 #ifndef MODULE 184 172 struct net_device * __init ultra_probe(int unit) 185 173 { ··· 580 592 if (found) 581 593 return 0; 582 594 return -ENXIO; 595 + } 596 + 597 + static void cleanup_card(struct net_device *dev) 598 + { 599 + /* NB: ultra_close_card() does free_irq */ 600 + #ifdef __ISAPNP__ 601 + struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; 602 + if (idev) 603 + pnp_device_detach(idev); 604 + #endif 605 + release_region(dev->base_addr - ULTRA_NIC_OFFSET, ULTRA_IO_EXTENT); 606 + iounmap(ei_status.mem); 583 607 } 584 608 585 609 void

+7 -7

drivers/net/wd.c

··· 127 127 return -ENODEV; 128 128 } 129 129 130 - static void cleanup_card(struct net_device *dev) 131 - { 132 - free_irq(dev->irq, dev); 133 - release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT); 134 - iounmap(ei_status.mem); 135 - } 136 - 137 130 #ifndef MODULE 138 131 struct net_device * __init wd_probe(int unit) 139 132 { ··· 529 536 if (found) 530 537 return 0; 531 538 return -ENXIO; 539 + } 540 + 541 + static void cleanup_card(struct net_device *dev) 542 + { 543 + free_irq(dev->irq, dev); 544 + release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT); 545 + iounmap(ei_status.mem); 532 546 } 533 547 534 548 void