diff options
Diffstat (limited to 'drivers/pcmcia/cs.c')
-rw-r--r-- | drivers/pcmcia/cs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index ccdbbe4936fd..037cb0c7e094 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c | |||
@@ -370,7 +370,7 @@ static int socket_reset(struct pcmcia_socket *skt) | |||
370 | return CS_NO_CARD; | 370 | return CS_NO_CARD; |
371 | 371 | ||
372 | if (status & SS_READY) | 372 | if (status & SS_READY) |
373 | return CS_SUCCESS; | 373 | return 0; |
374 | 374 | ||
375 | msleep(unreset_check * 10); | 375 | msleep(unreset_check * 10); |
376 | } | 376 | } |
@@ -507,7 +507,7 @@ static int socket_insert(struct pcmcia_socket *skt) | |||
507 | return CS_NO_CARD; | 507 | return CS_NO_CARD; |
508 | 508 | ||
509 | ret = socket_setup(skt, setup_delay); | 509 | ret = socket_setup(skt, setup_delay); |
510 | if (ret == CS_SUCCESS) { | 510 | if (ret == 0) { |
511 | skt->state |= SOCKET_PRESENT; | 511 | skt->state |= SOCKET_PRESENT; |
512 | 512 | ||
513 | dev_printk(KERN_NOTICE, &skt->dev, | 513 | dev_printk(KERN_NOTICE, &skt->dev, |
@@ -543,7 +543,7 @@ static int socket_suspend(struct pcmcia_socket *skt) | |||
543 | skt->ops->suspend(skt); | 543 | skt->ops->suspend(skt); |
544 | skt->state |= SOCKET_SUSPEND; | 544 | skt->state |= SOCKET_SUSPEND; |
545 | 545 | ||
546 | return CS_SUCCESS; | 546 | return 0; |
547 | } | 547 | } |
548 | 548 | ||
549 | /* | 549 | /* |
@@ -568,7 +568,7 @@ static int socket_resume(struct pcmcia_socket *skt) | |||
568 | } | 568 | } |
569 | 569 | ||
570 | ret = socket_setup(skt, resume_delay); | 570 | ret = socket_setup(skt, resume_delay); |
571 | if (ret == CS_SUCCESS) { | 571 | if (ret == 0) { |
572 | /* | 572 | /* |
573 | * FIXME: need a better check here for cardbus cards. | 573 | * FIXME: need a better check here for cardbus cards. |
574 | */ | 574 | */ |
@@ -593,7 +593,7 @@ static int socket_resume(struct pcmcia_socket *skt) | |||
593 | 593 | ||
594 | skt->state &= ~SOCKET_SUSPEND; | 594 | skt->state &= ~SOCKET_SUSPEND; |
595 | 595 | ||
596 | return CS_SUCCESS; | 596 | return 0; |
597 | } | 597 | } |
598 | 598 | ||
599 | static void socket_remove(struct pcmcia_socket *skt) | 599 | static void socket_remove(struct pcmcia_socket *skt) |
@@ -778,14 +778,14 @@ int pccard_reset_card(struct pcmcia_socket *skt) | |||
778 | send_event(skt, CS_EVENT_RESET_PHYSICAL, CS_EVENT_PRI_LOW); | 778 | send_event(skt, CS_EVENT_RESET_PHYSICAL, CS_EVENT_PRI_LOW); |
779 | if (skt->callback) | 779 | if (skt->callback) |
780 | skt->callback->suspend(skt); | 780 | skt->callback->suspend(skt); |
781 | if (socket_reset(skt) == CS_SUCCESS) { | 781 | if (socket_reset(skt) == 0) { |
782 | send_event(skt, CS_EVENT_CARD_RESET, CS_EVENT_PRI_LOW); | 782 | send_event(skt, CS_EVENT_CARD_RESET, CS_EVENT_PRI_LOW); |
783 | if (skt->callback) | 783 | if (skt->callback) |
784 | skt->callback->resume(skt); | 784 | skt->callback->resume(skt); |
785 | } | 785 | } |
786 | } | 786 | } |
787 | 787 | ||
788 | ret = CS_SUCCESS; | 788 | ret = 0; |
789 | } while (0); | 789 | } while (0); |
790 | mutex_unlock(&skt->skt_mutex); | 790 | mutex_unlock(&skt->skt_mutex); |
791 | 791 | ||