Commit 1e212f36 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Linus Torvalds
Browse files

[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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bf45d9b0

drivers/bluetooth/bluecard_cs.c

+1 −5
Original line number Diff line number Diff line
@@ -895,11 +895,6 @@ static dev_link_t *bluecard_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 = &bluecard_event;

	client_reg.Version = 0x0210;

	client_reg.event_callback_args.client_data = link;
@@ -1103,6 +1098,7 @@ static struct pcmcia_driver bluecard_driver = { 
		.name	= "bluecard_cs",

	},

	.attach		= bluecard_attach,

	.event		= bluecard_event,

	.detach		= bluecard_detach,

	.id_table	= bluecard_ids,

};

drivers/bluetooth/bt3c_cs.c

+1 −5
Original line number Diff line number Diff line
@@ -696,11 +696,6 @@ static dev_link_t *bt3c_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 = &bt3c_event;

	client_reg.Version = 0x0210;

	client_reg.event_callback_args.client_data = link;
@@ -947,6 +942,7 @@ static struct pcmcia_driver bt3c_driver = { 
		.name	= "bt3c_cs",

	},

	.attach		= bt3c_attach,

	.event		= bt3c_event,

	.detach		= bt3c_detach,

	.id_table	= bt3c_ids,

};

drivers/bluetooth/btuart_cs.c

+1 −5
Original line number Diff line number Diff line
@@ -615,11 +615,6 @@ static dev_link_t *btuart_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 = &btuart_event;

	client_reg.Version = 0x0210;

	client_reg.event_callback_args.client_data = link;
@@ -867,6 +862,7 @@ static struct pcmcia_driver btuart_driver = { 
		.name	= "btuart_cs",

	},

	.attach		= btuart_attach,

	.event		= btuart_event,

	.detach		= btuart_detach,

	.id_table	= btuart_ids,

};

drivers/bluetooth/dtl1_cs.c

+1 −5
Original line number Diff line number Diff line
@@ -594,11 +594,6 @@ static dev_link_t *dtl1_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 = &dtl1_event;

	client_reg.Version = 0x0210;

	client_reg.event_callback_args.client_data = link;
@@ -820,6 +815,7 @@ static struct pcmcia_driver dtl1_driver = { 
		.name	= "dtl1_cs",

	},

	.attach		= dtl1_attach,

	.event		= dtl1_event,

	.detach		= dtl1_detach,

	.id_table	= dtl1_ids,

};

drivers/char/pcmcia/synclink_cs.c

+1 −5
Original line number Diff line number Diff line
@@ -593,11 +593,6 @@ static dev_link_t *mgslpc_attach(void) 
    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 = &mgslpc_event;

    client_reg.Version = 0x0210;

    client_reg.event_callback_args.client_data = link;
@@ -3093,6 +3088,7 @@ static struct pcmcia_driver mgslpc_driver = { 
		.name	= "synclink_cs",

	},

	.attach		= mgslpc_attach,

	.event		= mgslpc_event,

	.detach		= mgslpc_detach,

	.id_table	= mgslpc_ids,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE