xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] pcmcia: embed dev_link_t into struct pcmcia_device

Browse Source 
Embed dev_link_t into struct pcmcia_device(), as they basically address the
same entity. The actual contents of dev_link_t will be cleaned up step by step.
This patch includes a bugfix from and signed-off-by Andrew Morton.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski
2006-03-05 10:45:09 +01:00
parent a78f4dd331
commit fd238232cd
52 changed files with 446 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/pcmcia/ds.c
View File

@@ -391,6 +391,7 @@ static int pcmcia_device_probe(struct device * dev)
}
p_dev->p_state &= ~CLIENT_UNBOUND;
p_dev->handle = p_dev;
ret = p_drv->probe(p_dev);
if (ret)
@@ -1039,12 +1040,10 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
ret = p_drv->suspend(p_dev);
if (ret)
return ret;
if (p_dev->instance) {
p_dev->instance->state |= DEV_SUSPEND;
if ((p_dev->instance->state & DEV_CONFIG) &&
!(p_dev->instance->state & DEV_SUSPEND_NORELEASE))
p_dev->state |= DEV_SUSPEND;
if ((p_dev->state & DEV_CONFIG) &&
!(p_dev->state & DEV_SUSPEND_NORELEASE))
pcmcia_release_configuration(p_dev);
}
}
return 0;
@@ -1061,16 +1060,14 @@ static int pcmcia_dev_resume(struct device * dev)
p_drv = to_pcmcia_drv(dev->driver);
if (p_drv && p_drv->resume) {
if (p_dev->instance) {
p_dev->instance->state &= ~DEV_SUSPEND;
if ((p_dev->instance->state & DEV_CONFIG) &&
!(p_dev->instance->state & DEV_SUSPEND_NORELEASE)){
p_dev->state &= ~DEV_SUSPEND;
if ((p_dev->state & DEV_CONFIG) &&
!(p_dev->state & DEV_SUSPEND_NORELEASE)){
ret = pcmcia_request_configuration(p_dev,
&p_dev->instance->conf);
&p_dev->conf);
if (ret)
return ret;
}
}
return p_drv->resume(p_dev);
}