pcmcia: deprecate CS_BAD_ARGS

CS_BAD_ARGS mean a badly written driver or invalid userspace ioctl access,
so translate that to -EINVAL.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

3 files changed, 10 insertions, 9 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 3ccf4091e877..5b24938ca154 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -78,7 +78,6 @@ static const lookup_t error_table[] = {
     { -EIO,                     "Input/Output error" },
     { -ENODEV,                  "No card present" },
     { -EINVAL,                  "Bad parameter" },
-    { CS_BAD_ARGS,              "Bad arguments" },
     { -EACCES,                  "Configuration locked" },
     { -EBUSY,                   "Resource in use" },
     { -ENOSPC,                  "No more items" },
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 99563134ac0f..f2352c227570 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -836,7 +836,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
     case DS_GET_CONFIGURATION_INFO:
         if (buf->config.Function &&
            (buf->config.Function >= s->functions))
-            ret = CS_BAD_ARGS;
+            ret = -EINVAL;
         else {
             struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->config.Function);
             ret = pccard_get_configuration_info(s, p_dev, &buf->config);
@@ -867,7 +867,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
     case DS_GET_STATUS:
             if (buf->status.Function &&
                 (buf->status.Function >= s->functions))
-                    ret = CS_BAD_ARGS;
+                    ret = -EINVAL;
             else {
                     struct pcmcia_device *p_dev = get_pcmcia_device(s, buf->status.Function);
                     ret = pccard_get_status(s, p_dev, &buf->status);
@@ -898,7 +898,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
             goto free_out;
         }
 
-        ret = CS_BAD_ARGS;
+        ret = -EINVAL;
 
         if (!(buf->conf_reg.Function &&
              (buf->conf_reg.Function >= s->functions))) {
@@ -970,7 +970,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
         case -ENOSYS:
             err = ret;
             break;
-        case CS_BAD_ARGS: case CS_BAD_TUPLE:
+        case CS_BAD_TUPLE:
             err = -EINVAL; break;
         case -ENOMEM:
             err = -ENOSPC; break;
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index fee57139a96f..de13c424101c 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -189,7 +189,7 @@ int pcmcia_access_configuration_register(struct pcmcia_device *p_dev,
                 pcmcia_write_cis_mem(s, 1, addr, 1, &val);
                 break;
         default:
-                return CS_BAD_ARGS;
+                return -EINVAL;
                 break;
         }
         return 0;
@@ -401,7 +401,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)
             (c->io.NumPorts1 != req->NumPorts1) ||
             (c->io.BasePort2 != req->BasePort2) ||
             (c->io.NumPorts2 != req->NumPorts2))
-                return CS_BAD_ARGS;
+                return -EINVAL;
 
         c->state &= ~CONFIG_IO_REQ;
 
@@ -855,8 +855,10 @@ int pcmcia_request_window(struct pcmcia_device **p_dev, win_req_t *req, window_h
         if (req->Attributes & WIN_USE_WAIT)
                 win->ctl.flags |= MAP_USE_WAIT;
         win->ctl.card_start = 0;
-        if (s->ops->set_mem_map(s, &win->ctl) != 0)
-                return CS_BAD_ARGS;
+        if (s->ops->set_mem_map(s, &win->ctl) != 0) {
+                ds_dbg(s, 0, "failed to set memory mapping\n");
+                return -EIO;
+        }
         s->state |= SOCKET_WIN_REQ(w);
 
         /* Return window handle */