Skip to content

Commit

Permalink
staging: ft1000: Fix coding style in ft1000_write/read_register funct…
Browse files Browse the repository at this point in the history
…ions.

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 4a526fc commit 31da7c0
Showing 1 changed file with 28 additions and 35 deletions.
63 changes: 28 additions & 35 deletions drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,28 +101,22 @@ static int ft1000_control(struct ft1000_device *ft1000dev, unsigned int pipe,
//
//---------------------------------------------------------------------------

int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegIndx)
int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data,
u16 nRegIndx)
{
int ret = STATUS_SUCCESS;

//DEBUG("ft1000_read_register: reg index is %d\n", nRegIndx);
//DEBUG("ft1000_read_register: spin_lock locked\n");
ret = ft1000_control(ft1000dev,
usb_rcvctrlpipe(ft1000dev->dev,0),
HARLEY_READ_REGISTER, //request --READ_REGISTER
HARLEY_READ_OPERATION, //requestType
0, //value
nRegIndx, //index
Data, //data
2, //data size
LARGE_TIMEOUT ); //timeout

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

//DEBUG("ft1000_read_register: data is %x \n", *Data);

return ret;
int ret = STATUS_SUCCESS;

ret = ft1000_control(ft1000dev,
usb_rcvctrlpipe(ft1000dev->dev, 0),
HARLEY_READ_REGISTER,
HARLEY_READ_OPERATION,
0,
nRegIndx,
Data,
2,
LARGE_TIMEOUT);

return ret;
}

//---------------------------------------------------------------------------
Expand All @@ -140,23 +134,22 @@ int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegInd
// Notes:
//
//---------------------------------------------------------------------------
int ft1000_write_register(struct ft1000_device *ft1000dev, u16 value, u16 nRegIndx)
int ft1000_write_register(struct ft1000_device *ft1000dev, u16 value,
u16 nRegIndx)
{
int ret = STATUS_SUCCESS;

//DEBUG("ft1000_write_register: value is: %d, reg index is: %d\n", value, nRegIndx);

ret = ft1000_control(ft1000dev,
usb_sndctrlpipe(ft1000dev->dev, 0),
HARLEY_WRITE_REGISTER, //request -- WRITE_REGISTER
HARLEY_WRITE_OPERATION, //requestType
value,
nRegIndx,
NULL,
0,
LARGE_TIMEOUT );
int ret = STATUS_SUCCESS;

ret = ft1000_control(ft1000dev,
usb_sndctrlpipe(ft1000dev->dev, 0),
HARLEY_WRITE_REGISTER,
HARLEY_WRITE_OPERATION,
value,
nRegIndx,
NULL,
0,
LARGE_TIMEOUT);

return ret;
return ret;
}

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

0 comments on commit 31da7c0

Please sign in to comment.