Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31da7c09 authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman
Browse files

staging: ft1000: Fix coding style in ft1000_write/read_register functions. 



Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4a526fca

drivers/staging/ft1000/ft1000-usb/ft1000_hw.c

+28 −35
Original line number Original line Diff line number Diff line
@@ -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;

	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,

	ret = ft1000_control(ft1000dev,

			     usb_rcvctrlpipe(ft1000dev->dev, 0),

			     usb_rcvctrlpipe(ft1000dev->dev, 0),

                         HARLEY_READ_REGISTER,   //request --READ_REGISTER

			     HARLEY_READ_REGISTER,

                         HARLEY_READ_OPERATION,  //requestType

			     HARLEY_READ_OPERATION,

                         0,                      //value

			     0,

                         nRegIndx,               //index

			     nRegIndx,

                         Data,                   //data

			     Data,

                         2,                      //data size

			     2,

                         LARGE_TIMEOUT );        //timeout

			     LARGE_TIMEOUT);



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



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





	return ret;

	return ret;



}

}





//---------------------------------------------------------------------------

//---------------------------------------------------------------------------
@@ -140,16 +134,15 @@ int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegInd 
// Notes:

// 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;

	int ret = STATUS_SUCCESS;





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



	ret = ft1000_control(ft1000dev,

	ret = ft1000_control(ft1000dev,

			     usb_sndctrlpipe(ft1000dev->dev, 0),

			     usb_sndctrlpipe(ft1000dev->dev, 0),

                           HARLEY_WRITE_REGISTER,       //request -- WRITE_REGISTER

			     HARLEY_WRITE_REGISTER,

                           HARLEY_WRITE_OPERATION,      //requestType

			     HARLEY_WRITE_OPERATION,

			     value,

			     value,

			     nRegIndx,

			     nRegIndx,

			     NULL,

			     NULL,