[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1287056171-12215-1-git-send-email-marek.belisko@gmail.com>
Date: Thu, 14 Oct 2010 13:36:11 +0200
From: Marek Belisko <marek.belisko@...il.com>
To: Greg Kroah-Hartman <gregkh@...e.de>,
Marek Belisko <marek.belisko@...il.com>,
Arnd Bergmann <arnd@...db.de>,
Vasiliy Kulikov <segooon@...il.com>,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Cc: Marek Belisko <marek.belisko@...il.com>
Subject: [PATCH] staging:ft1000:Use specific error return value.
Signed-off-by: Marek Belisko <marek.belisko@...il.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 30 +++---------------------
1 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index d0637c3..507a248 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -141,12 +141,12 @@ static int ft1000_control(struct ft1000_device *ft1000dev,unsigned int pipe,
if (ft1000dev == NULL )
{
DEBUG("NULL ft1000dev, failure\n");
- return STATUS_FAILURE;
+ return -ENODEV;
}
else if ( ft1000dev->dev == NULL )
{
DEBUG("NULL ft1000dev->dev, failure\n");
- return STATUS_FAILURE;
+ return -ENODEV;
}
ret = usb_control_msg(ft1000dev->dev,
@@ -159,11 +159,8 @@ static int ft1000_control(struct ft1000_device *ft1000dev,unsigned int pipe,
size,
LARGE_TIMEOUT);
- if (ret>0)
- ret = STATUS_SUCCESS;
- else
- ret = STATUS_FAILURE;
-
+ if (ret > 0)
+ ret = 0;
return ret;
@@ -204,8 +201,6 @@ u16 ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegInd
//DEBUG("ft1000_read_register: ret is %d \n", ret);
//DEBUG("ft1000_read_register: data is %x \n", *Data);
- if ( ret != STATUS_SUCCESS )
- return STATUS_FAILURE;
return ret;
@@ -242,9 +237,6 @@ u16 ft1000_write_register(struct ft1000_device *ft1000dev, USHORT value, u16 nRe
0,
LARGE_TIMEOUT );
- if ( ret != STATUS_SUCCESS )
- return STATUS_FAILURE;
-
return ret;
}
@@ -283,8 +275,6 @@ u16 ft1000_read_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buf
//DEBUG("ft1000_read_dpram32: ret is %d \n", ret);
//DEBUG("ft1000_read_dpram32: ret=%d \n", ret);
- if ( ret != STATUS_SUCCESS )
- return STATUS_FAILURE;
return ret;
@@ -324,11 +314,6 @@ u16 ft1000_write_dpram32(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR bu
cnt, //buffer size
LARGE_TIMEOUT );
-
- if ( ret != STATUS_SUCCESS )
- return STATUS_FAILURE;
-
-
return ret;
}
@@ -375,8 +360,6 @@ u16 ft1000_read_dpram16(struct ft1000_device *ft1000dev, USHORT indx, PUCHAR buf
//DEBUG("ft1000_read_dpram16: data is %x \n", *buffer);
- if ( ret != STATUS_SUCCESS )
- return STATUS_FAILURE;
return ret;
@@ -424,11 +407,6 @@ u16 ft1000_write_dpram16(struct ft1000_device *ft1000dev, USHORT indx, USHORT va
0, //buffer size
LARGE_TIMEOUT );
-
- if ( ret != STATUS_SUCCESS )
- return STATUS_FAILURE;
-
-
return ret;
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists