Skip to content

Commit

Permalink
staging: ft1000: Fix coding style in ft1000_read/write_dpram16 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 e3fc923 commit 460bd5d
Showing 1 changed file with 34 additions and 48 deletions.
82 changes: 34 additions & 48 deletions drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

//---------------------------------------------------------------------------
Expand All @@ -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;
}

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

0 comments on commit 460bd5d

Please sign in to comment.