diff options
Diffstat (limited to 'drivers/pcmcia/cs.c')
-rw-r--r-- | drivers/pcmcia/cs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 790af87a922f..6d6f82b38a68 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c | |||
@@ -135,7 +135,7 @@ int pcmcia_socket_dev_resume(struct device *dev) | |||
135 | EXPORT_SYMBOL(pcmcia_socket_dev_resume); | 135 | EXPORT_SYMBOL(pcmcia_socket_dev_resume); |
136 | 136 | ||
137 | 137 | ||
138 | struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt) | 138 | struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt) |
139 | { | 139 | { |
140 | struct device *dev = get_device(&skt->dev); | 140 | struct device *dev = get_device(&skt->dev); |
141 | if (!dev) | 141 | if (!dev) |
@@ -145,7 +145,7 @@ struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt) | |||
145 | put_device(&skt->dev); | 145 | put_device(&skt->dev); |
146 | return NULL; | 146 | return NULL; |
147 | } | 147 | } |
148 | return (skt); | 148 | return skt; |
149 | } | 149 | } |
150 | EXPORT_SYMBOL(pcmcia_get_socket); | 150 | EXPORT_SYMBOL(pcmcia_get_socket); |
151 | 151 | ||
@@ -297,7 +297,7 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket) | |||
297 | EXPORT_SYMBOL(pcmcia_unregister_socket); | 297 | EXPORT_SYMBOL(pcmcia_unregister_socket); |
298 | 298 | ||
299 | 299 | ||
300 | struct pcmcia_socket * pcmcia_get_socket_by_nr(unsigned int nr) | 300 | struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr) |
301 | { | 301 | { |
302 | struct pcmcia_socket *s; | 302 | struct pcmcia_socket *s; |
303 | 303 | ||
@@ -736,7 +736,7 @@ EXPORT_SYMBOL(pcmcia_parse_events); | |||
736 | /* register pcmcia_callback */ | 736 | /* register pcmcia_callback */ |
737 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c) | 737 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c) |
738 | { | 738 | { |
739 | int ret = 0; | 739 | int ret = 0; |
740 | 740 | ||
741 | /* s->skt_mutex also protects s->callback */ | 741 | /* s->skt_mutex also protects s->callback */ |
742 | mutex_lock(&s->skt_mutex); | 742 | mutex_lock(&s->skt_mutex); |
@@ -848,7 +848,7 @@ EXPORT_SYMBOL(pcmcia_suspend_card); | |||
848 | int pcmcia_resume_card(struct pcmcia_socket *skt) | 848 | int pcmcia_resume_card(struct pcmcia_socket *skt) |
849 | { | 849 | { |
850 | int ret; | 850 | int ret; |
851 | 851 | ||
852 | dev_dbg(&skt->dev, "waking up socket\n"); | 852 | dev_dbg(&skt->dev, "waking up socket\n"); |
853 | 853 | ||
854 | mutex_lock(&skt->skt_mutex); | 854 | mutex_lock(&skt->skt_mutex); |
@@ -876,7 +876,7 @@ EXPORT_SYMBOL(pcmcia_resume_card); | |||
876 | int pcmcia_eject_card(struct pcmcia_socket *skt) | 876 | int pcmcia_eject_card(struct pcmcia_socket *skt) |
877 | { | 877 | { |
878 | int ret; | 878 | int ret; |
879 | 879 | ||
880 | dev_dbg(&skt->dev, "user eject request\n"); | 880 | dev_dbg(&skt->dev, "user eject request\n"); |
881 | 881 | ||
882 | mutex_lock(&skt->skt_mutex); | 882 | mutex_lock(&skt->skt_mutex); |