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/bt3c_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/bt3c_cs.c')
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index ac1410c0a43..7b0f4f0bead 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -842,28 +842,6 @@ static void bt3c_release(dev_link_t *link) | |||
842 | pcmcia_disable_device(link->handle); | 842 | pcmcia_disable_device(link->handle); |
843 | } | 843 | } |
844 | 844 | ||
845 | static int bt3c_suspend(struct pcmcia_device *dev) | ||
846 | { | ||
847 | dev_link_t *link = dev_to_instance(dev); | ||
848 | |||
849 | link->state |= DEV_SUSPEND; | ||
850 | if (link->state & DEV_CONFIG) | ||
851 | pcmcia_release_configuration(link->handle); | ||
852 | |||
853 | return 0; | ||
854 | } | ||
855 | |||
856 | static int bt3c_resume(struct pcmcia_device *dev) | ||
857 | { | ||
858 | dev_link_t *link = dev_to_instance(dev); | ||
859 | |||
860 | link->state &= ~DEV_SUSPEND; | ||
861 | if (DEV_OK(link)) | ||
862 | pcmcia_request_configuration(link->handle, &link->conf); | ||
863 | |||
864 | return 0; | ||
865 | } | ||
866 | |||
867 | 845 | ||
868 | static struct pcmcia_device_id bt3c_ids[] = { | 846 | static struct pcmcia_device_id bt3c_ids[] = { |
869 | PCMCIA_DEVICE_PROD_ID13("3COM", "Bluetooth PC Card", 0xefce0a31, 0xd4ce9b02), | 847 | PCMCIA_DEVICE_PROD_ID13("3COM", "Bluetooth PC Card", 0xefce0a31, 0xd4ce9b02), |
@@ -879,8 +857,6 @@ static struct pcmcia_driver bt3c_driver = { | |||
879 | .probe = bt3c_attach, | 857 | .probe = bt3c_attach, |
880 | .remove = bt3c_detach, | 858 | .remove = bt3c_detach, |
881 | .id_table = bt3c_ids, | 859 | .id_table = bt3c_ids, |
882 | .suspend = bt3c_suspend, | ||
883 | .resume = bt3c_resume, | ||
884 | }; | 860 | }; |
885 | 861 | ||
886 | static int __init init_bt3c_cs(void) | 862 | static int __init init_bt3c_cs(void) |