All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging:ft1000:Use specific error return value.
@ 2010-10-14 11:36 Marek Belisko
  0 siblings, 0 replies; only message in thread
From: Marek Belisko @ 2010-10-14 11:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Marek Belisko, Arnd Bergmann,
	Vasiliy Kulikov, devel, linux-kernel
  Cc: Marek Belisko

Signed-off-by: Marek Belisko <marek.belisko@gmail.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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2010-10-14 11:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-14 11:36 [PATCH] staging:ft1000:Use specific error return value Marek Belisko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.