diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-01 18:02:33 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 10:15:52 -0500 |
commit | 8661bb5b4af1849c1f5a4e80c4e275fd13c155d6 (patch) | |
tree | ad99d85ea8d6f5c4c99b93f869bfd412994fb4ee /drivers/bluetooth/btuart_cs.c | |
parent | 50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7 (diff) |
[PATCH] pcmcia: default suspend and resume handling
In all but one case, the suspend and resume functions of PCMCIA drivers
contain mostly of calls to pcmcia_release_configuration() and
pcmcia_request_configuration(). Therefore, move this code out of the
drivers and into the core.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/bluetooth/btuart_cs.c')
-rw-r--r-- | drivers/bluetooth/btuart_cs.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 8cd54bb199f9..9a507bdb8bc6 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -771,29 +771,6 @@ static void btuart_release(dev_link_t *link) | |||
771 | pcmcia_disable_device(link->handle); | 771 | pcmcia_disable_device(link->handle); |
772 | } | 772 | } |
773 | 773 | ||
774 | static int btuart_suspend(struct pcmcia_device *dev) | ||
775 | { | ||
776 | dev_link_t *link = dev_to_instance(dev); | ||
777 | |||
778 | link->state |= DEV_SUSPEND; | ||
779 | if (link->state & DEV_CONFIG) | ||
780 | pcmcia_release_configuration(link->handle); | ||
781 | |||
782 | return 0; | ||
783 | } | ||
784 | |||
785 | static int btuart_resume(struct pcmcia_device *dev) | ||
786 | { | ||
787 | dev_link_t *link = dev_to_instance(dev); | ||
788 | |||
789 | link->state &= ~DEV_SUSPEND; | ||
790 | if (DEV_OK(link)) | ||
791 | pcmcia_request_configuration(link->handle, &link->conf); | ||
792 | |||
793 | return 0; | ||
794 | } | ||
795 | |||
796 | |||
797 | static struct pcmcia_device_id btuart_ids[] = { | 774 | static struct pcmcia_device_id btuart_ids[] = { |
798 | /* don't use this driver. Use serial_cs + hci_uart instead */ | 775 | /* don't use this driver. Use serial_cs + hci_uart instead */ |
799 | PCMCIA_DEVICE_NULL | 776 | PCMCIA_DEVICE_NULL |
@@ -808,8 +785,6 @@ static struct pcmcia_driver btuart_driver = { | |||
808 | .probe = btuart_attach, | 785 | .probe = btuart_attach, |
809 | .remove = btuart_detach, | 786 | .remove = btuart_detach, |
810 | .id_table = btuart_ids, | 787 | .id_table = btuart_ids, |
811 | .suspend = btuart_suspend, | ||
812 | .resume = btuart_resume, | ||
813 | }; | 788 | }; |
814 | 789 | ||
815 | static int __init init_btuart_cs(void) | 790 | static int __init init_btuart_cs(void) |