Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98e4c28b authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

[PATCH] pcmcia: new suspend core 



Move the suspend and resume methods out of the event handler, and into
special functions. Also use these functions for pre- and post-reset, as
almost all drivers already do, and the remaining ones can easily be
converted.

Bugfix to include/pcmcia/ds.c
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 63e7ebd0

Documentation/pcmcia/driver-changes.txt

+6 −0
Original line number Diff line number Diff line 
This file details changes in 2.6 which affect PCMCIA card driver authors:



* Move suspend, resume and reset out of event handler (as of 2.6.16)

       int (*suspend)          (struct pcmcia_device *dev);

       int (*resume)           (struct pcmcia_device *dev);

  should be initialized in struct pcmcia_driver, and handle

  (SUSPEND == RESET_PHYSICAL) and (RESUME == CARD_RESET) events



* event handler initialization in struct pcmcia_driver (as of 2.6.13)

   The event handler is notified of all events, and must be initialized

   as the event() callback in the driver's struct pcmcia_driver.

drivers/bluetooth/bluecard_cs.c

+23 −14
Original line number Diff line number Diff line
@@ -1045,6 +1045,27 @@ static void bluecard_release(dev_link_t *link) 
	link->state &= ~DEV_CONFIG;

}



static int bluecard_suspend(struct pcmcia_device *dev)

{

	dev_link_t *link = dev_to_instance(dev);



	link->state |= DEV_SUSPEND;

	if (link->state & DEV_CONFIG)

		pcmcia_release_configuration(link->handle);



	return 0;

}



static int bluecard_resume(struct pcmcia_device *dev)

{

	dev_link_t *link = dev_to_instance(dev);



	link->state &= ~DEV_SUSPEND;

	if (DEV_OK(link))

		pcmcia_request_configuration(link->handle, &link->conf);



	return 0;

}



static int bluecard_event(event_t event, int priority, event_callback_args_t *args)

{
@@ -1063,20 +1084,6 @@ static int bluecard_event(event_t event, int priority, event_callback_args_t *ar 
		link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;

		bluecard_config(link);

		break;

	case CS_EVENT_PM_SUSPEND:

		link->state |= DEV_SUSPEND;

		/* Fall through... */

	case CS_EVENT_RESET_PHYSICAL:

		if (link->state & DEV_CONFIG)

			pcmcia_release_configuration(link->handle);

		break;

	case CS_EVENT_PM_RESUME:

		link->state &= ~DEV_SUSPEND;

		/* Fall through... */

	case CS_EVENT_CARD_RESET:

		if (DEV_OK(link))

			pcmcia_request_configuration(link->handle, &link->conf);

		break;

	}



	return 0;
@@ -1099,6 +1106,8 @@ static struct pcmcia_driver bluecard_driver = { 
	.event		= bluecard_event,

	.detach		= bluecard_detach,

	.id_table	= bluecard_ids,

	.suspend	= bluecard_suspend,

	.resume		= bluecard_resume,

};



static int __init init_bluecard_cs(void)

drivers/bluetooth/bt3c_cs.c

+23 −14
Original line number Diff line number Diff line
@@ -891,6 +891,27 @@ static void bt3c_release(dev_link_t *link) 
	link->state &= ~DEV_CONFIG;

}



static int bt3c_suspend(struct pcmcia_device *dev)

{

	dev_link_t *link = dev_to_instance(dev);



	link->state |= DEV_SUSPEND;

	if (link->state & DEV_CONFIG)

		pcmcia_release_configuration(link->handle);



	return 0;

}



static int bt3c_resume(struct pcmcia_device *dev)

{

	dev_link_t *link = dev_to_instance(dev);



	link->state &= ~DEV_SUSPEND;

	if (DEV_OK(link))

		pcmcia_request_configuration(link->handle, &link->conf);



	return 0;

}



static int bt3c_event(event_t event, int priority, event_callback_args_t *args)

{
@@ -909,20 +930,6 @@ static int bt3c_event(event_t event, int priority, event_callback_args_t *args) 
		link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;

		bt3c_config(link);

		break;

	case CS_EVENT_PM_SUSPEND:

		link->state |= DEV_SUSPEND;

		/* Fall through... */

	case CS_EVENT_RESET_PHYSICAL:

		if (link->state & DEV_CONFIG)

			pcmcia_release_configuration(link->handle);

		break;

	case CS_EVENT_PM_RESUME:

		link->state &= ~DEV_SUSPEND;

		/* Fall through... */

	case CS_EVENT_CARD_RESET:

		if (DEV_OK(link))

			pcmcia_request_configuration(link->handle, &link->conf);

		break;

	}



	return 0;
@@ -943,6 +950,8 @@ static struct pcmcia_driver bt3c_driver = { 
	.event		= bt3c_event,

	.detach		= bt3c_detach,

	.id_table	= bt3c_ids,

	.suspend	= bt3c_suspend,

	.resume		= bt3c_resume,

};



static int __init init_bt3c_cs(void)

drivers/bluetooth/btuart_cs.c

+24 −14
Original line number Diff line number Diff line
@@ -811,6 +811,28 @@ static void btuart_release(dev_link_t *link) 
	link->state &= ~DEV_CONFIG;

}



static int btuart_suspend(struct pcmcia_device *dev)

{

	dev_link_t *link = dev_to_instance(dev);



	link->state |= DEV_SUSPEND;

	if (link->state & DEV_CONFIG)

		pcmcia_release_configuration(link->handle);



	return 0;

}



static int btuart_resume(struct pcmcia_device *dev)

{

	dev_link_t *link = dev_to_instance(dev);



	link->state &= ~DEV_SUSPEND;

	if (DEV_OK(link))

		pcmcia_request_configuration(link->handle, &link->conf);



	return 0;

}





static int btuart_event(event_t event, int priority, event_callback_args_t *args)

{
@@ -829,20 +851,6 @@ static int btuart_event(event_t event, int priority, event_callback_args_t *args 
		link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;

		btuart_config(link);

		break;

	case CS_EVENT_PM_SUSPEND:

		link->state |= DEV_SUSPEND;

		/* Fall through... */

	case CS_EVENT_RESET_PHYSICAL:

		if (link->state & DEV_CONFIG)

			pcmcia_release_configuration(link->handle);

		break;

	case CS_EVENT_PM_RESUME:

		link->state &= ~DEV_SUSPEND;

		/* Fall through... */

	case CS_EVENT_CARD_RESET:

		if (DEV_OK(link))

			pcmcia_request_configuration(link->handle, &link->conf);

		break;

	}



	return 0;
@@ -863,6 +871,8 @@ static struct pcmcia_driver btuart_driver = { 
	.event		= btuart_event,

	.detach		= btuart_detach,

	.id_table	= btuart_ids,

	.suspend	= btuart_suspend,

	.resume		= btuart_resume,

};



static int __init init_btuart_cs(void)

drivers/bluetooth/dtl1_cs.c

+23 −14
Original line number Diff line number Diff line
@@ -763,6 +763,27 @@ static void dtl1_release(dev_link_t *link) 
	link->state &= ~DEV_CONFIG;

}



static int dtl1_suspend(struct pcmcia_device *dev)

{

	dev_link_t *link = dev_to_instance(dev);



	link->state |= DEV_SUSPEND;

	if (link->state & DEV_CONFIG)

		pcmcia_release_configuration(link->handle);



	return 0;

}



static int dtl1_resume(struct pcmcia_device *dev)

{

	dev_link_t *link = dev_to_instance(dev);



	link->state &= ~DEV_SUSPEND;

	if (DEV_OK(link))

		pcmcia_request_configuration(link->handle, &link->conf);



	return 0;

}



static int dtl1_event(event_t event, int priority, event_callback_args_t *args)

{
@@ -781,20 +802,6 @@ static int dtl1_event(event_t event, int priority, event_callback_args_t *args) 
		link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;

		dtl1_config(link);

		break;

	case CS_EVENT_PM_SUSPEND:

		link->state |= DEV_SUSPEND;

		/* Fall through... */

	case CS_EVENT_RESET_PHYSICAL:

		if (link->state & DEV_CONFIG)

			pcmcia_release_configuration(link->handle);

		break;

	case CS_EVENT_PM_RESUME:

		link->state &= ~DEV_SUSPEND;

		/* Fall through... */

	case CS_EVENT_CARD_RESET:

		if (DEV_OK(link))

			pcmcia_request_configuration(link->handle, &link->conf);

		break;

	}



	return 0;
@@ -816,6 +823,8 @@ static struct pcmcia_driver dtl1_driver = { 
	.event		= dtl1_event,

	.detach		= dtl1_detach,

	.id_table	= dtl1_ids,

	.suspend	= dtl1_suspend,

	.resume		= dtl1_resume,

};



static int __init init_dtl1_cs(void)