diff options
| author | Marek Belisko <marek.belisko@open-nandra.com> | 2011-02-03 11:07:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-04 12:43:43 -0800 |
| commit | 857af455c8e7865a8a24047534a92e3d016da4ab (patch) | |
| tree | 0d00f028213028756acea80c26cfe6ddcc981776 /drivers/staging/ft1000 | |
| parent | d7a7318b387ae4be24619fbac68ce5b5f5a7b7da (diff) | |
staging: ft1000: Fix coding style in write_blk_fifo() function.
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')
| -rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_download.c | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c index 7a930f56ff46..0c69a68c5c4b 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_download.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_download.c @@ -644,44 +644,42 @@ static void usb_dnld_complete (struct urb *urb) // Notes: // //--------------------------------------------------------------------------- -static u32 write_blk_fifo (struct ft1000_device *ft1000dev, u16 **pUsFile, u8 **pUcFile, long word_length) +static u32 write_blk_fifo(struct ft1000_device *ft1000dev, u16 **pUsFile, + u8 **pUcFile, long word_length) { - u32 Status = STATUS_SUCCESS; - int byte_length; - long aligncnt; - - byte_length = word_length * 4; + u32 Status = STATUS_SUCCESS; + int byte_length; + long aligncnt; - if (byte_length % 4) - aligncnt = 4 - (byte_length % 4); - else - aligncnt = 0; - byte_length += aligncnt; + byte_length = word_length * 4; - if (byte_length && ((byte_length % 64) == 0)) { - byte_length += 4; - } + if (byte_length % 4) + aligncnt = 4 - (byte_length % 4); + else + aligncnt = 0; + byte_length += aligncnt; - if (byte_length < 64) - byte_length = 68; + if (byte_length && ((byte_length % 64) == 0)) + byte_length += 4; + if (byte_length < 64) + byte_length = 68; - usb_init_urb(ft1000dev->tx_urb); - memcpy (ft1000dev->tx_buf, *pUcFile, byte_length); - usb_fill_bulk_urb(ft1000dev->tx_urb, - ft1000dev->dev, - usb_sndbulkpipe(ft1000dev->dev, ft1000dev->bulk_out_endpointAddr), - ft1000dev->tx_buf, - byte_length, - usb_dnld_complete, - (void*)ft1000dev); + usb_init_urb(ft1000dev->tx_urb); + memcpy(ft1000dev->tx_buf, *pUcFile, byte_length); + usb_fill_bulk_urb(ft1000dev->tx_urb, + ft1000dev->dev, + usb_sndbulkpipe(ft1000dev->dev, + ft1000dev->bulk_out_endpointAddr), + ft1000dev->tx_buf, byte_length, usb_dnld_complete, + (void *)ft1000dev); - usb_submit_urb(ft1000dev->tx_urb, GFP_ATOMIC); + usb_submit_urb(ft1000dev->tx_urb, GFP_ATOMIC); - *pUsFile = *pUsFile + (word_length << 1); - *pUcFile = *pUcFile + (word_length << 2); + *pUsFile = *pUsFile + (word_length << 1); + *pUcFile = *pUcFile + (word_length << 2); - return Status; + return Status; } //--------------------------------------------------------------------------- |