pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE

CS_BAD_TYPE was only used in cs.c and already properly annotated by error
messages. CS_BAD_ATTRIBUTE and CS_BAD_PAGE mean a badly written driver, so
ds_dbg() output and -EINVAL seems to be enough.

(includes bugfix from and
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
)
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 591d9627bb2a..4092a5976e62 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -74,22 +74,19 @@ typedef struct lookup_t {
 } lookup_t;
 
 static const lookup_t error_table[] = {
-    { CS_SUCCESS,               "Operation succeeded" },
-    { CS_BAD_ATTRIBUTE,         "Bad attribute", },
+    { 0,                        "Operation succeeded" },
     { CS_BAD_BASE,              "Bad base address" },
     { CS_BAD_IRQ,               "Bad IRQ" },
     { CS_BAD_OFFSET,            "Bad offset" },
-    { CS_BAD_PAGE,              "Bad page number" },
     { CS_BAD_SIZE,              "Bad size" },
-    { CS_BAD_TYPE,              "Bad type" },
     { -EIO,                     "Input/Output error" },
     { -ENODEV,                  "No card present" },
     { -EINVAL,                  "Bad parameter" },
     { CS_BAD_ARGS,              "Bad arguments" },
     { -EACCES,                  "Configuration locked" },
-    { CS_IN_USE,                "Resource in use" },
+    { -EBUSY,                   "Resource in use" },
     { -ENOSPC,                  "No more items" },
-    { CS_OUT_OF_RESOURCE,       "Out of resource" },
+    { -ENOMEM,                  "Out of resource" },
     { CS_BAD_TUPLE,             "Bad CIS tuple" }
 };