[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
@@ -161,11 +161,6 @@ static dev_link_t *avmcs_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 = &avmcs_event;
|
||||
client_reg.Version = 0x0210;
|
||||
client_reg.event_callback_args.client_data = link;
|
||||
ret = pcmcia_register_client(&link->handle, &client_reg);
|
||||
@@ -500,6 +495,7 @@ static struct pcmcia_driver avmcs_driver = {
|
||||
.name = "avm_cs",
|
||||
},
|
||||
.attach = avmcs_attach,
|
||||
.event = avmcs_event,
|
||||
.detach = avmcs_detach,
|
||||
.id_table = avmcs_ids,
|
||||
};
|
||||
|
@@ -183,11 +183,6 @@ static dev_link_t *avma1cs_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 = &avma1cs_event;
|
||||
client_reg.Version = 0x0210;
|
||||
client_reg.event_callback_args.client_data = link;
|
||||
ret = pcmcia_register_client(&link->handle, &client_reg);
|
||||
@@ -514,6 +509,7 @@ static struct pcmcia_driver avma1cs_driver = {
|
||||
.name = "avma1_cs",
|
||||
},
|
||||
.attach = avma1cs_attach,
|
||||
.event = avma1cs_event,
|
||||
.detach = avma1cs_detach,
|
||||
.id_table = avma1cs_ids,
|
||||
};
|
||||
|
@@ -212,11 +212,6 @@ static dev_link_t *elsa_cs_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 = &elsa_cs_event;
|
||||
client_reg.Version = 0x0210;
|
||||
client_reg.event_callback_args.client_data = link;
|
||||
ret = pcmcia_register_client(&link->handle, &client_reg);
|
||||
@@ -521,6 +516,7 @@ static struct pcmcia_driver elsa_cs_driver = {
|
||||
.name = "elsa_cs",
|
||||
},
|
||||
.attach = elsa_cs_attach,
|
||||
.event = elsa_cs_event,
|
||||
.detach = elsa_cs_detach,
|
||||
.id_table = elsa_ids,
|
||||
};
|
||||
|
@@ -226,11 +226,6 @@ static dev_link_t *sedlbauer_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 = &sedlbauer_event;
|
||||
client_reg.Version = 0x0210;
|
||||
client_reg.event_callback_args.client_data = link;
|
||||
ret = pcmcia_register_client(&link->handle, &client_reg);
|
||||
@@ -634,6 +629,7 @@ static struct pcmcia_driver sedlbauer_driver = {
|
||||
.name = "sedlbauer_cs",
|
||||
},
|
||||
.attach = sedlbauer_attach,
|
||||
.event = sedlbauer_event,
|
||||
.detach = sedlbauer_detach,
|
||||
.id_table = sedlbauer_ids,
|
||||
};
|
||||
|
@@ -193,11 +193,6 @@ static dev_link_t *teles_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 = &teles_cs_event;
|
||||
client_reg.Version = 0x0210;
|
||||
client_reg.event_callback_args.client_data = link;
|
||||
ret = pcmcia_register_client(&link->handle, &client_reg);
|
||||
@@ -501,6 +496,7 @@ static struct pcmcia_driver teles_cs_driver = {
|
||||
.name = "teles_cs",
|
||||
},
|
||||
.attach = teles_attach,
|
||||
.event = teles_cs_event,
|
||||
.detach = teles_detach,
|
||||
.id_table = teles_ids,
|
||||
};
|
||||
|
Reference in New Issue
Block a user