Skip to content

Commit

Permalink
staging: ft1000: Fix coding style in ft1000_read/write_dpram32 functi…
Browse files Browse the repository at this point in the history
…ons.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed Feb 9, 2011
1 parent 31da7c0 commit e3fc923
Showing 1 changed file with 28 additions and 33 deletions.
61 changes: 28 additions & 33 deletions drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,27 +169,22 @@ int ft1000_write_register(struct ft1000_device *ft1000dev, u16 value,
//
//---------------------------------------------------------------------------

int ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt)
int ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer,
u16 cnt)
{
int ret = STATUS_SUCCESS;

//DEBUG("ft1000_read_dpram32: indx: %d cnt: %d\n", indx, cnt);
ret =ft1000_control(ft1000dev,
usb_rcvctrlpipe(ft1000dev->dev,0),
HARLEY_READ_DPRAM_32, //request --READ_DPRAM_32
HARLEY_READ_OPERATION, //requestType
0, //value
indx, //index
buffer, //data
cnt, //data size
LARGE_TIMEOUT ); //timeout

//DEBUG("ft1000_read_dpram32: ret is %d \n", ret);

//DEBUG("ft1000_read_dpram32: ret=%d \n", ret);
int ret = STATUS_SUCCESS;

return ret;
ret = ft1000_control(ft1000dev,
usb_rcvctrlpipe(ft1000dev->dev, 0),
HARLEY_READ_DPRAM_32,
HARLEY_READ_OPERATION,
0,
indx,
buffer,
cnt,
LARGE_TIMEOUT);

return ret;
}

//---------------------------------------------------------------------------
Expand All @@ -208,25 +203,25 @@ int ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u
// Notes:
//
//---------------------------------------------------------------------------
int ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt)
int ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer,
u16 cnt)
{
int ret = STATUS_SUCCESS;
int ret = STATUS_SUCCESS;

//DEBUG("ft1000_write_dpram32: indx: %d buffer: %x cnt: %d\n", indx, buffer, cnt);
if ( cnt % 4)
cnt += cnt - (cnt % 4);
if (cnt % 4)
cnt += cnt - (cnt % 4);

ret = ft1000_control(ft1000dev,
usb_sndctrlpipe(ft1000dev->dev, 0),
HARLEY_WRITE_DPRAM_32, //request -- WRITE_DPRAM_32
HARLEY_WRITE_OPERATION, //requestType
0, //value
indx, //index
buffer, //buffer
cnt, //buffer size
LARGE_TIMEOUT );
ret = ft1000_control(ft1000dev,
usb_sndctrlpipe(ft1000dev->dev, 0),
HARLEY_WRITE_DPRAM_32,
HARLEY_WRITE_OPERATION,
0,
indx,
buffer,
cnt,
LARGE_TIMEOUT);

return ret;
return ret;
}

//---------------------------------------------------------------------------
Expand Down

0 comments on commit e3fc923

Please sign in to comment.