pcmcia: move unbind/rebind into dev_pm_ops.complete
PATCH RESEND 1/1 pcmcia: move unbind/rebind into dev_pm_ops.complete
The idea of moving rebind procedure into pm.complete was taken from the usb-subsystem, which has similar problems with reattaching devices during/after resume.
Signed-off-by Christian Lamparter <[email protected]>
---
Note: I have submitted this patch before in march. But as far as I can tell it was neither rejected nor accepted?!
Regards,
Chr
PS: I'm not on the pcmcia/kernel list, so please keep the 'CC'.
--- drivers/pcmcia/cs.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-)
drivers/pcmcia/cs.c +18 -4
@@ -512,6 +512,13 @@ static int socket_late_resume(struct pcmcia_socket *skt)return socket_insert (skt); } +if (!(skt->state &SOCKET_CARDBUS ) && (skt->callback)) + skt->callback->early_resume (skt); +return 0 ; +} + +static int socket_complete_resume (struct pcmcia_socket *skt) +{#ifdef CONFIG_CARDBUS if (skt->state &SOCKET_CARDBUS ) {/* We can't be sure the CardBus card is the same
@@ -519,11 +526,8 @@ static int socket_late_resume(struct pcmcia_socket *skt)* and re-add... */ cb_free (skt); cb_alloc(skt); - return 0; }#endif -if (!(skt->state &SOCKET_CARDBUS ) && (skt->callback)) - skt->callback->early_resume (skt);return 0 ; }
@@ -534,11 +538,15 @@ static int socket_late_resume(struct pcmcia_socket *skt)*/ static int socket_resume (struct pcmcia_socket *skt) { +int err;if (!(skt->state &SOCKET_SUSPEND ))return -EBUSY ;socket_early_resume (skt); -return socket_late_resume (skt); + err =socket_late_resume (skt); +if (!err) +socket_complete_resume (skt); +return err; }static void socket_remove (struct pcmcia_socket *skt)
@@ -849,6 +857,11 @@ static int __used pcmcia_socket_dev_resume(struct device *dev)return __pcmcia_pm_op (dev, socket_late_resume); } +static void __used pcmcia_socket_dev_complete (struct device *dev) +{ +__pcmcia_pm_op (dev, socket_complete_resume); +} +static const struct dev_pm_ops pcmcia_socket_pm_ops = {/* dev_resume may be called with IRQs enabled */ SET_SYSTEM_SLEEP_PM_OPS(NULL,
@@ -863,6 +876,7 @@ static const struct dev_pm_ops pcmcia_socket_pm_ops = { .resume_noirq = pcmcia_socket_dev_resume_noirq, .thaw_noirq = pcmcia_socket_dev_resume_noirq, .restore_noirq = pcmcia_socket_dev_resume_noirq, + .complete = pcmcia_socket_dev_complete, };#define PCMCIA_SOCKET_CLASS_PM_OPS (&pcmcia_socket_pm_ops)
Signature · 1 line
1.7.9.1