Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PNP: remove MODULE infrastructure

Browse source 
We don't support building any part of PNP as a module (*drivers* can be
modules, of course, but the PNP infrastructure itself can not).  Since
MODULE will never be defined, remove the ifdefs and dead code.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bjorn Helgaas 2007-08-15 10:32:12 -06:00 committed by Len Brown
parent 6c504d30a4
commit 4f0217e302
2 changed files with 0 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
drivers/pnp/isapnp/proc.c
View file

@ -112,33 +112,6 @@ static int isapnp_proc_attach_device(struct pnp_dev *dev)
return 0; return 0;
} }
#ifdef MODULE
static int __exit isapnp_proc_detach_device(struct pnp_dev *dev)
{
struct pnp_card *bus = dev->card;
struct proc_dir_entry *de;
char name[16];
if (!(de = bus->procdir))
return -EINVAL;
sprintf(name, "%02x", dev->number);
remove_proc_entry(name, de);
return 0;
}
static int __exit isapnp_proc_detach_bus(struct pnp_card *bus)
{
struct proc_dir_entry *de;
char name[16];
if (!(de = bus->procdir))
return -EINVAL;
sprintf(name, "%02x", bus->number);
remove_proc_entry(name, isapnp_proc_bus_dir);
return 0;
}
#endif /* MODULE */
int __init isapnp_proc_init(void) int __init isapnp_proc_init(void)
{ {
struct pnp_dev *dev; struct pnp_dev *dev;
@ -149,21 +122,3 @@ int __init isapnp_proc_init(void)
} }
return 0; return 0;
} }
#ifdef MODULE
int __exit isapnp_proc_done(void)
{
struct pnp_dev *dev;
struct pnp_bus *card;
isapnp_for_each_dev(dev) {
isapnp_proc_detach_device(dev);
}
isapnp_for_each_card(card) {
isapnp_proc_detach_bus(card);
}
if (isapnp_proc_bus_dir)
remove_proc_entry("isapnp", proc_bus);
return 0;
}
#endif /* MODULE */

43
drivers/pnp/pnpbios/core.c
View file

@ -419,7 +419,6 @@ static void __init build_devlist(void)
static int pnpbios_disabled; static int pnpbios_disabled;
int pnpbios_dont_use_current_config; int pnpbios_dont_use_current_config;
#ifndef MODULE
static int __init pnpbios_setup(char *str) static int __init pnpbios_setup(char *str)
{ {
int invert; int invert;
@ -443,7 +442,6 @@ static int __init pnpbios_setup(char *str)
} }
__setup("pnpbios=", pnpbios_setup); __setup("pnpbios=", pnpbios_setup);
#endif
/* PnP BIOS signature: "$PnP" */ /* PnP BIOS signature: "$PnP" */
#define PNP_SIGNATURE (('$' << 0) + ('P' << 8) + ('n' << 16) + ('P' << 24)) #define PNP_SIGNATURE (('$' << 0) + ('P' << 8) + ('n' << 16) + ('P' << 24))
@ -607,48 +605,7 @@ static int __init pnpbios_thread_init(void)
return 0; return 0;
} }
#ifndef MODULE
/* init/main.c calls pnpbios_init early */
/* Start the kernel thread later: */ /* Start the kernel thread later: */
module_init(pnpbios_thread_init); module_init(pnpbios_thread_init);
#else
/*
* N.B.: Building pnpbios as a module hasn't been fully implemented
*/
MODULE_LICENSE("GPL");
static int __init pnpbios_init_all(void)
{
int r;
r = pnpbios_init();
if (r)
return r;
r = pnpbios_thread_init();
if (r)
return r;
return 0;
}
static void __exit pnpbios_exit(void)
{
#ifdef CONFIG_HOTPLUG
unloading = 1;
wait_for_completion(&unload_sem);
#endif
pnpbios_proc_exit();
/* We ought to free resources here */
return;
}
module_init(pnpbios_init_all);
module_exit(pnpbios_exit);
#endif
EXPORT_SYMBOL(pnpbios_protocol); EXPORT_SYMBOL(pnpbios_protocol);