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/telephony | |
| 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/telephony')
| -rw-r--r-- | drivers/telephony/ixj_pcmcia.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c index fe3cde0da84a..509465586ded 100644 --- a/drivers/telephony/ixj_pcmcia.c +++ b/drivers/telephony/ixj_pcmcia.c | |||
| @@ -232,28 +232,6 @@ static void ixj_cs_release(dev_link_t *link) | |||
| 232 | pcmcia_disable_device(link->handle); | 232 | pcmcia_disable_device(link->handle); |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | static int ixj_suspend(struct pcmcia_device *dev) | ||
| 236 | { | ||
| 237 | dev_link_t *link = dev_to_instance(dev); | ||
| 238 | |||
| 239 | link->state |= DEV_SUSPEND; | ||
| 240 | if (link->state & DEV_CONFIG) | ||
| 241 | pcmcia_release_configuration(link->handle); | ||
| 242 | |||
| 243 | return 0; | ||
| 244 | } | ||
| 245 | |||
| 246 | static int ixj_resume(struct pcmcia_device *dev) | ||
| 247 | { | ||
| 248 | dev_link_t *link = dev_to_instance(dev); | ||
| 249 | |||
| 250 | link->state &= ~DEV_SUSPEND; | ||
| 251 | if (DEV_OK(link)) | ||
| 252 | pcmcia_request_configuration(link->handle, &link->conf); | ||
| 253 | |||
| 254 | return 0; | ||
| 255 | } | ||
| 256 | |||
| 257 | static struct pcmcia_device_id ixj_ids[] = { | 235 | static struct pcmcia_device_id ixj_ids[] = { |
| 258 | PCMCIA_DEVICE_MANF_CARD(0x0257, 0x0600), | 236 | PCMCIA_DEVICE_MANF_CARD(0x0257, 0x0600), |
| 259 | PCMCIA_DEVICE_NULL | 237 | PCMCIA_DEVICE_NULL |
| @@ -268,8 +246,6 @@ static struct pcmcia_driver ixj_driver = { | |||
| 268 | .probe = ixj_attach, | 246 | .probe = ixj_attach, |
| 269 | .remove = ixj_detach, | 247 | .remove = ixj_detach, |
| 270 | .id_table = ixj_ids, | 248 | .id_table = ixj_ids, |
| 271 | .suspend = ixj_suspend, | ||
| 272 | .resume = ixj_resume, | ||
| 273 | }; | 249 | }; |
| 274 | 250 | ||
| 275 | static int __init ixj_pcmcia_init(void) | 251 | static int __init ixj_pcmcia_init(void) |
