diff options
Diffstat (limited to 'drivers/pcmcia/pcmcia_ioctl.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_ioctl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index 53dadc111002..ef64ceb5e751 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c | |||
@@ -167,7 +167,7 @@ static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) | |||
167 | #else | 167 | #else |
168 | 168 | ||
169 | static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) { | 169 | static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) { |
170 | return CS_SUCCESS; | 170 | return 0; |
171 | } | 171 | } |
172 | 172 | ||
173 | #endif | 173 | #endif |
@@ -274,7 +274,7 @@ static int pccard_get_status(struct pcmcia_socket *s, | |||
274 | status->CardState |= | 274 | status->CardState |= |
275 | (reg & ESR_REQ_ATTN) ? CS_EVENT_REQUEST_ATTENTION : 0; | 275 | (reg & ESR_REQ_ATTN) ? CS_EVENT_REQUEST_ATTENTION : 0; |
276 | } | 276 | } |
277 | return CS_SUCCESS; | 277 | return 0; |
278 | } | 278 | } |
279 | status->CardState |= | 279 | status->CardState |= |
280 | (val & SS_WRPROT) ? CS_EVENT_WRITE_PROTECT : 0; | 280 | (val & SS_WRPROT) ? CS_EVENT_WRITE_PROTECT : 0; |
@@ -284,7 +284,7 @@ static int pccard_get_status(struct pcmcia_socket *s, | |||
284 | (val & SS_BATWARN) ? CS_EVENT_BATTERY_LOW : 0; | 284 | (val & SS_BATWARN) ? CS_EVENT_BATTERY_LOW : 0; |
285 | status->CardState |= | 285 | status->CardState |= |
286 | (val & SS_READY) ? CS_EVENT_READY_CHANGE : 0; | 286 | (val & SS_READY) ? CS_EVENT_READY_CHANGE : 0; |
287 | return CS_SUCCESS; | 287 | return 0; |
288 | } /* pccard_get_status */ | 288 | } /* pccard_get_status */ |
289 | 289 | ||
290 | int pccard_get_configuration_info(struct pcmcia_socket *s, | 290 | int pccard_get_configuration_info(struct pcmcia_socket *s, |
@@ -315,7 +315,7 @@ int pccard_get_configuration_info(struct pcmcia_socket *s, | |||
315 | config->BasePort1 + 1; | 315 | config->BasePort1 + 1; |
316 | } | 316 | } |
317 | } | 317 | } |
318 | return CS_SUCCESS; | 318 | return 0; |
319 | } | 319 | } |
320 | #endif | 320 | #endif |
321 | 321 | ||
@@ -331,7 +331,7 @@ int pccard_get_configuration_info(struct pcmcia_socket *s, | |||
331 | config->Attributes = 0; | 331 | config->Attributes = 0; |
332 | config->Vcc = s->socket.Vcc; | 332 | config->Vcc = s->socket.Vcc; |
333 | config->Vpp1 = config->Vpp2 = s->socket.Vpp; | 333 | config->Vpp1 = config->Vpp2 = s->socket.Vpp; |
334 | return CS_SUCCESS; | 334 | return 0; |
335 | } | 335 | } |
336 | 336 | ||
337 | config->Attributes = c->Attributes | CONF_VALID_CLIENT; | 337 | config->Attributes = c->Attributes | CONF_VALID_CLIENT; |
@@ -355,7 +355,7 @@ int pccard_get_configuration_info(struct pcmcia_socket *s, | |||
355 | config->Attributes2 = c->io.Attributes2; | 355 | config->Attributes2 = c->io.Attributes2; |
356 | config->IOAddrLines = c->io.IOAddrLines; | 356 | config->IOAddrLines = c->io.IOAddrLines; |
357 | 357 | ||
358 | return CS_SUCCESS; | 358 | return 0; |
359 | } /* pccard_get_configuration_info */ | 359 | } /* pccard_get_configuration_info */ |
360 | 360 | ||
361 | 361 | ||
@@ -961,7 +961,7 @@ static int ds_ioctl(struct inode * inode, struct file * file, | |||
961 | err = -EINVAL; | 961 | err = -EINVAL; |
962 | } | 962 | } |
963 | 963 | ||
964 | if ((err == 0) && (ret != CS_SUCCESS)) { | 964 | if ((err == 0) && (ret != 0)) { |
965 | ds_dbg(2, "ds_ioctl: ret = %d\n", ret); | 965 | ds_dbg(2, "ds_ioctl: ret = %d\n", ret); |
966 | switch (ret) { | 966 | switch (ret) { |
967 | case CS_BAD_SOCKET: case CS_NO_CARD: | 967 | case CS_BAD_SOCKET: case CS_NO_CARD: |