diff options
| author | Marek Belisko <marek.belisko@open-nandra.com> | 2011-02-09 15:02:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-09 14:55:50 -0800 |
| commit | 460bd5ddabe5ff4474292864097a7b527cdd0e9c (patch) | |
| tree | 2a0a545cc0edc8a84e0ba82c1b3881fd3ab093b6 /drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | |
| parent | e3fc923d4d84d6327e92f7b4cc8f6906ebc2719f (diff) | |
| download | kernel_samsung_smdk4412-460bd5ddabe5ff4474292864097a7b527cdd0e9c.zip kernel_samsung_smdk4412-460bd5ddabe5ff4474292864097a7b527cdd0e9c.tar.gz kernel_samsung_smdk4412-460bd5ddabe5ff4474292864097a7b527cdd0e9c.tar.bz2 | |
staging: ft1000: Fix coding style in ft1000_read/write_dpram16 functions.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000/ft1000-usb/ft1000_hw.c')
| -rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 82 |
1 files changed, 34 insertions, 48 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index be07b42..aa4ad7b 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c @@ -240,36 +240,28 @@ int ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, // Notes: // //--------------------------------------------------------------------------- -int ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u8 highlow) +int ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, + u8 highlow) { - int ret = STATUS_SUCCESS; - - //DEBUG("ft1000_read_dpram16: indx: %d hightlow: %d\n", indx, highlow); - - u8 request; - - if (highlow == 0 ) - request = HARLEY_READ_DPRAM_LOW; - else - request = HARLEY_READ_DPRAM_HIGH; - - ret = ft1000_control(ft1000dev, - usb_rcvctrlpipe(ft1000dev->dev,0), - request, //request --READ_DPRAM_H/L - HARLEY_READ_OPERATION, //requestType - 0, //value - indx, //index - buffer, //data - 2, //data size - LARGE_TIMEOUT ); //timeout - - //DEBUG("ft1000_read_dpram16: ret is %d \n", ret); - + int ret = STATUS_SUCCESS; + u8 request; - //DEBUG("ft1000_read_dpram16: data is %x \n", *buffer); + if (highlow == 0) + request = HARLEY_READ_DPRAM_LOW; + else + request = HARLEY_READ_DPRAM_HIGH; - return ret; + ret = ft1000_control(ft1000dev, + usb_rcvctrlpipe(ft1000dev->dev, 0), + request, + HARLEY_READ_OPERATION, + 0, + indx, + buffer, + 2, + LARGE_TIMEOUT); + return ret; } //--------------------------------------------------------------------------- @@ -290,31 +282,25 @@ int ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u //--------------------------------------------------------------------------- int ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u8 highlow) { - int ret = STATUS_SUCCESS; - - - - //DEBUG("ft1000_write_dpram16: indx: %d value: %d highlow: %d\n", indx, value, highlow); - - u8 request; - + int ret = STATUS_SUCCESS; + u8 request; - if ( highlow == 0 ) - request = HARLEY_WRITE_DPRAM_LOW; - else - request = HARLEY_WRITE_DPRAM_HIGH; + if (highlow == 0) + request = HARLEY_WRITE_DPRAM_LOW; + else + request = HARLEY_WRITE_DPRAM_HIGH; - ret = ft1000_control(ft1000dev, - usb_sndctrlpipe(ft1000dev->dev, 0), - request, //request -- WRITE_DPRAM_H/L - HARLEY_WRITE_OPERATION, //requestType - value, //value - indx, //index - NULL, //buffer - 0, //buffer size - LARGE_TIMEOUT ); + ret = ft1000_control(ft1000dev, + usb_sndctrlpipe(ft1000dev->dev, 0), + request, + HARLEY_WRITE_OPERATION, + value, + indx, + NULL, + 0, + LARGE_TIMEOUT); - return ret; + return ret; } //--------------------------------------------------------------------------- |