Commit b0add950 authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18978952

drivers/staging/ft1000/ft1000-usb/ft1000_hw.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/ft1000/ft1000-usb/ft1000_usb.h

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ struct app_info_block { 


#define FT1000_STATUS_CLOSING  0x01



#define LARGE_TIMEOUT   5000



#define DSPBCMSGID              0x10



/* Electrabuzz specific DPRAM mapping */