Commit 8e5c3584 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Russell King

[PCMCIA] remove "init_status" from struct pcmcia_driver

As we don't have a late_initcall in ds.c any more, we can't easily
distinguish between in-kernel drivers and those built as modules. This
information was used by cardmgr to detect whether "rmmod" makes
sense. As unloading of modules seems to be deprecated behaviour anyway
in 2.5., and the current driver unloading process is IMO broken
anyway, I don't shed any tears on this lost functionality.
parent 1118d921
...@@ -129,9 +129,6 @@ static LIST_HEAD(bus_socket_list); ...@@ -129,9 +129,6 @@ static LIST_HEAD(bus_socket_list);
extern struct proc_dir_entry *proc_pccard; extern struct proc_dir_entry *proc_pccard;
/* We use this to distinguish in-kernel from modular drivers */
static int init_status = 1;
/*====================================================================*/ /*====================================================================*/
static void cs_error(client_handle_t handle, int func, int ret) static void cs_error(client_handle_t handle, int func, int ret)
...@@ -156,7 +153,6 @@ int pcmcia_register_driver(struct pcmcia_driver *driver) ...@@ -156,7 +153,6 @@ int pcmcia_register_driver(struct pcmcia_driver *driver)
return -EINVAL; return -EINVAL;
driver->use_count = 0; driver->use_count = 0;
driver->status = init_status;
driver->drv.bus = &pcmcia_bus_type; driver->drv.bus = &pcmcia_bus_type;
return driver_register(&driver->drv); return driver_register(&driver->drv);
...@@ -251,8 +247,7 @@ static int proc_read_drivers_callback(struct device_driver *driver, void *d) ...@@ -251,8 +247,7 @@ static int proc_read_drivers_callback(struct device_driver *driver, void *d)
struct pcmcia_driver *p_dev = container_of(driver, struct pcmcia_driver *p_dev = container_of(driver,
struct pcmcia_driver, drv); struct pcmcia_driver, drv);
*p += sprintf(*p, "%-24.24s %d %d\n", driver->name, p_dev->status, *p += sprintf(*p, "%-24.24s 1 %d\n", driver->name, p_dev->use_count);
p_dev->use_count);
d = (void *) p; d = (void *) p;
return 0; return 0;
......
...@@ -144,7 +144,7 @@ int unregister_pccard_driver(dev_info_t *dev_info); ...@@ -144,7 +144,7 @@ int unregister_pccard_driver(dev_info_t *dev_info);
extern struct bus_type pcmcia_bus_type; extern struct bus_type pcmcia_bus_type;
struct pcmcia_driver { struct pcmcia_driver {
int use_count, status; int use_count;
dev_link_t *(*attach)(void); dev_link_t *(*attach)(void);
void (*detach)(dev_link_t *); void (*detach)(dev_link_t *);
struct module *owner; struct module *owner;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment