[PATCH] pcmcia: move event handler
Move the "event handler" to struct pcmcia_driver -- the unified event handler will disappear really soon, but switching it to struct pcmcia_driver in the meantime allows for better "step-by-step" patches. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
bf45d9b0ac
commit
1e212f3645
@@ -218,11 +218,6 @@ static dev_link_t *atmel_attach(void)
|
||||
link->next = dev_list;
|
||||
dev_list = link;
|
||||
client_reg.dev_info = &dev_info;
|
||||
client_reg.EventMask =
|
||||
CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
|
||||
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
|
||||
CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
|
||||
client_reg.event_handler = &atmel_event;
|
||||
client_reg.Version = 0x0210;
|
||||
client_reg.event_callback_args.client_data = link;
|
||||
ret = pcmcia_register_client(&link->handle, &client_reg);
|
||||
@@ -668,12 +663,13 @@ static struct pcmcia_device_id atmel_ids[] = {
|
||||
MODULE_DEVICE_TABLE(pcmcia, atmel_ids);
|
||||
|
||||
static struct pcmcia_driver atmel_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.drv = {
|
||||
.name = "atmel_cs",
|
||||
.owner = THIS_MODULE,
|
||||
.drv = {
|
||||
.name = "atmel_cs",
|
||||
},
|
||||
.attach = atmel_attach,
|
||||
.detach = atmel_detach,
|
||||
.attach = atmel_attach,
|
||||
.event = atmel_event,
|
||||
.detach = atmel_detach,
|
||||
.id_table = atmel_ids,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user