pcmcia: deprecate CS_BAD_TUPLE

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

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index a393501..55a46af 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -74,37 +74,14 @@ typedef struct lookup_t {
 } lookup_t;
 
 static const lookup_t error_table[] = {
-    { CS_SUCCESS,              "Operation succeeded" },
-    { CS_BAD_ADAPTER,          "Bad adapter" },
-    { CS_BAD_ATTRIBUTE,        "Bad attribute", },
-    { CS_BAD_BASE,             "Bad base address" },
-    { CS_BAD_EDC,              "Bad EDC" },
-    { CS_BAD_IRQ,              "Bad IRQ" },
-    { CS_BAD_OFFSET,           "Bad offset" },
-    { CS_BAD_PAGE,             "Bad page number" },
-    { CS_READ_FAILURE,         "Read failure" },
-    { CS_BAD_SIZE,             "Bad size" },
-    { CS_BAD_SOCKET,           "Bad socket" },
-    { CS_BAD_TYPE,             "Bad type" },
-    { CS_BAD_VCC,              "Bad Vcc" },
-    { CS_BAD_VPP,              "Bad Vpp" },
-    { CS_BAD_WINDOW,           "Bad window" },
-    { CS_WRITE_FAILURE,                "Write failure" },
-    { CS_NO_CARD,              "No card present" },
-    { CS_UNSUPPORTED_FUNCTION, "Usupported function" },
-    { CS_UNSUPPORTED_MODE,     "Unsupported mode" },
-    { CS_BAD_SPEED,            "Bad speed" },
-    { CS_BUSY,                 "Resource busy" },
-    { CS_GENERAL_FAILURE,      "General failure" },
-    { CS_WRITE_PROTECTED,      "Write protected" },
-    { CS_BAD_ARG_LENGTH,       "Bad argument length" },
-    { CS_BAD_ARGS,             "Bad arguments" },
-    { CS_CONFIGURATION_LOCKED, "Configuration locked" },
-    { CS_IN_USE,               "Resource in use" },
-    { CS_NO_MORE_ITEMS,                "No more items" },
-    { CS_OUT_OF_RESOURCE,      "Out of resource" },
-    { CS_BAD_HANDLE,           "Bad handle" },
-    { CS_BAD_TUPLE,            "Bad CIS tuple" }
+    { 0,                       "Operation succeeded" },
+    { -EIO,                    "Input/Output error" },
+    { -ENODEV,                 "No card present" },
+    { -EINVAL,                 "Bad parameter" },
+    { -EACCES,                 "Configuration locked" },
+    { -EBUSY,                  "Resource in use" },
+    { -ENOSPC,                 "No more items" },
+    { -ENOMEM,                 "Out of resource" },
 };
 
 
@@ -187,7 +164,7 @@ static int pcmcia_report_error(struct pcmcia_device *p_dev, error_info_t *err)
        else
                printk("%s: Unknown error code %#x\n", serv, err->retcode);
 
-       return CS_SUCCESS;
+       return 0;
 } /* report_error */
 
 /* end of code which was in cs.c before */