aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_ioctl.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2008-08-03 12:10:53 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-08-23 02:29:56 +0200
commit69ba44331e81e4a15b504175ec70b7b4b4e5a8b9 (patch)
treecad7ae00519ff61d88f3766463c43119189d37b9 /drivers/pcmcia/pcmcia_ioctl.c
parent610e23749e87920136e1a221266a43cb7e3823f1 (diff)
downloadkernel_samsung_aries-69ba44331e81e4a15b504175ec70b7b4b4e5a8b9.zip
kernel_samsung_aries-69ba44331e81e4a15b504175ec70b7b4b4e5a8b9.tar.gz
kernel_samsung_aries-69ba44331e81e4a15b504175ec70b7b4b4e5a8b9.tar.bz2
pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
These four error values mostly mean a badly written driver, so ds_dbg() output and -EINVAL seems to be enough. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/pcmcia_ioctl.c')
-rw-r--r--drivers/pcmcia/pcmcia_ioctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index e27c71e..9956313 100644
--- 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;