staging: ft1000: Replace timeout values with USB_CTRL_G(S)ET_TIMEOUT.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index 21c5ed6d14f9fcd65ee55d0036496cccf126e7d3..809fa4886961ac87768a18ff0bd4be86e8b8209f 100644 (file)
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -110,7 +110,7 @@ int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data,
                             nRegIndx,
                             Data,
                             2,
-                            LARGE_TIMEOUT);
+                            USB_CTRL_GET_TIMEOUT);
 
        return ret;
 }
@@ -143,7 +143,7 @@ int ft1000_write_register(struct ft1000_device *ft1000dev, u16 value,
                             nRegIndx,
                             NULL,
                             0,
-                            LARGE_TIMEOUT);
+                            USB_CTRL_SET_TIMEOUT);
 
        return ret;
 }
@@ -178,7 +178,7 @@ int ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer,
                             indx,
                             buffer,
                             cnt,
-                            LARGE_TIMEOUT);
+                            USB_CTRL_GET_TIMEOUT);
 
        return ret;
 }
@@ -215,7 +215,7 @@ int ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer,
                             indx,
                             buffer,
                             cnt,
-                            LARGE_TIMEOUT);
+                            USB_CTRL_SET_TIMEOUT);
 
        return ret;
 }
@@ -255,7 +255,7 @@ int ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer,
                             indx,
                             buffer,
                             2,
-                            LARGE_TIMEOUT);
+                            USB_CTRL_GET_TIMEOUT);
 
        return ret;
 }
@@ -294,7 +294,7 @@ int ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u
                             indx,
                             NULL,
                             0,
-                            LARGE_TIMEOUT);
+                            USB_CTRL_SET_TIMEOUT);
 
        return ret;
 }

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
index 642bb89942f572ecb9140162f2e58048297430cf..2aa6a1c7fd38046d67c07905a8a7efb8d3ab9032 100644 (file)
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
@@ -36,8 +36,6 @@ struct app_info_block {
 
 #define FT1000_STATUS_CLOSING  0x01
 
-#define LARGE_TIMEOUT   5000
-
 #define DSPBCMSGID              0x10
 
 /* Electrabuzz specific DPRAM mapping */