pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE

[safe/jmp/linux-2.6] / drivers / pcmcia / pcmcia_ioctl.c

diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index e27c71e..9956313 100644 (file)
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -149,7 +149,7 @@ static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)
 
        irq = adj->resource.irq.IRQ;
        if ((irq < 0) || (irq > 15))
-               return CS_BAD_IRQ;
+               return -EINVAL;
 
        if (adj->Action != REMOVE_MANAGED_RESOURCE)
                return 0;
@@ -970,8 +970,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
        case -ENOSYS:
            err = ret;
            break;
-       case CS_BAD_ARGS: case CS_BAD_IRQ:
-       case CS_BAD_TUPLE:
+       case CS_BAD_ARGS: case CS_BAD_TUPLE:
            err = -EINVAL; break;
        case -ENOMEM:
            err = -ENOSPC; break;