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/dtl1_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/dtl1_cs.c')
-rw-r--r-- | drivers/bluetooth/dtl1_cs.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index efbc8a543a9a..39dbe7300d0f 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
@@ -723,28 +723,6 @@ static void dtl1_release(dev_link_t *link) | |||
723 | pcmcia_disable_device(link->handle); | 723 | pcmcia_disable_device(link->handle); |
724 | } | 724 | } |
725 | 725 | ||
726 | static int dtl1_suspend(struct pcmcia_device *dev) | ||
727 | { | ||
728 | dev_link_t *link = dev_to_instance(dev); | ||
729 | |||
730 | link->state |= DEV_SUSPEND; | ||
731 | if (link->state & DEV_CONFIG) | ||
732 | pcmcia_release_configuration(link->handle); | ||
733 | |||
734 | return 0; | ||
735 | } | ||
736 | |||
737 | static int dtl1_resume(struct pcmcia_device *dev) | ||
738 | { | ||
739 | dev_link_t *link = dev_to_instance(dev); | ||
740 | |||
741 | link->state &= ~DEV_SUSPEND; | ||
742 | if (DEV_OK(link)) | ||
743 | pcmcia_request_configuration(link->handle, &link->conf); | ||
744 | |||
745 | return 0; | ||
746 | } | ||
747 | |||
748 | 726 | ||
749 | static struct pcmcia_device_id dtl1_ids[] = { | 727 | static struct pcmcia_device_id dtl1_ids[] = { |
750 | PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d), | 728 | PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d), |
@@ -762,8 +740,6 @@ static struct pcmcia_driver dtl1_driver = { | |||
762 | .probe = dtl1_attach, | 740 | .probe = dtl1_attach, |
763 | .remove = dtl1_detach, | 741 | .remove = dtl1_detach, |
764 | .id_table = dtl1_ids, | 742 | .id_table = dtl1_ids, |
765 | .suspend = dtl1_suspend, | ||
766 | .resume = dtl1_resume, | ||
767 | }; | 743 | }; |
768 | 744 | ||
769 | static int __init init_dtl1_cs(void) | 745 | static int __init init_dtl1_cs(void) |