You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[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: Andrew Morton <akpm@osdl.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user