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

Commit 4a526fca authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman
Browse files

staging: ft1000: Fix return values type. 



Change return values type from u16 to int because all functions
use ft1000_control function which return int.

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

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

+16 −16
Original line number Diff line number Diff line
@@ -101,9 +101,9 @@ static int ft1000_control(struct ft1000_device *ft1000dev, unsigned int pipe, 
//

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



u16 ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegIndx)

int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegIndx)

{

    u16 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");
@@ -140,9 +140,9 @@ u16 ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegInd 
// Notes:

//

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

u16 ft1000_write_register(struct ft1000_device *ft1000dev, u16 value, u16 nRegIndx)

int ft1000_write_register(struct ft1000_device *ft1000dev, u16 value, u16 nRegIndx)

{

     u16 ret = STATUS_SUCCESS;

     int ret = STATUS_SUCCESS;



     //DEBUG("ft1000_write_register: value is: %d, reg index is: %d\n", value, nRegIndx);
@@ -176,9 +176,9 @@ u16 ft1000_write_register(struct ft1000_device *ft1000dev, u16 value, u16 nRegIn 
//

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



u16 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)

{

    u16 ret = STATUS_SUCCESS;

    int ret = STATUS_SUCCESS;



    //DEBUG("ft1000_read_dpram32: indx: %d  cnt: %d\n", indx, cnt);

    ret =ft1000_control(ft1000dev,
@@ -215,9 +215,9 @@ u16 ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u 
// Notes:

//

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

u16 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)

{

     u16 ret = STATUS_SUCCESS;

     int ret = STATUS_SUCCESS;



     //DEBUG("ft1000_write_dpram32: indx: %d   buffer: %x cnt: %d\n", indx, buffer, cnt);

     if ( cnt % 4)
@@ -252,9 +252,9 @@ u16 ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, 
// Notes:

//

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

u16 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)

{

    u16 ret = STATUS_SUCCESS;

    int ret = STATUS_SUCCESS;



    //DEBUG("ft1000_read_dpram16: indx: %d  hightlow: %d\n", indx, highlow);
@@ -300,9 +300,9 @@ u16 ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u 
// Notes:

//

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

u16 ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u8 highlow)

int ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u8 highlow)

{

     u16 ret = STATUS_SUCCESS;

     int ret = STATUS_SUCCESS;
@@ -345,11 +345,11 @@ u16 ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u 
// Notes:

//

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

u16 fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer)

int fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer)

{

    u8 buf[16];

    u16 pos;

    u16 ret = STATUS_SUCCESS;

    int ret = STATUS_SUCCESS;



    //DEBUG("fix_ft1000_read_dpram32: indx: %d  \n", indx);

    pos = (indx / 4)*4;
@@ -394,7 +394,7 @@ u16 fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffe 
// Notes:

//

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

u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer)

int fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer)

{

    u16 pos1;

    u16 pos2;
@@ -402,7 +402,7 @@ u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buff 
    u8 buf[32];

    u8 resultbuffer[32];

    u8 *pdata;

    u16 ret  = STATUS_SUCCESS;

    int ret  = STATUS_SUCCESS;



    //DEBUG("fix_ft1000_write_dpram32: Entered:\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#define FTNET_PROC init_net.proc_net





u16 ft1000_read_dpram16 (struct ft1000_device *ft1000dev, u16 indx,

int ft1000_read_dpram16 (struct ft1000_device *ft1000dev, u16 indx,

			 u8 *buffer, u8 highlow);

drivers/staging/ft1000/ft1000-usb/ft1000_usb.h

+8 −8
Original line number Diff line number Diff line
@@ -560,14 +560,14 @@ struct dpram_blk { 
    u16 *pbuffer;

} __attribute__ ((packed));



u16 ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegIndx);

u16 ft1000_write_register(struct ft1000_device *ft1000dev, u16 value, u16 nRegIndx);

u16 ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt);

u16 ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u16 cnt);

u16 ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u8 highlow);

u16 ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u8 highlow);

u16 fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer);

u16 fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer);

int ft1000_read_register(struct ft1000_device *ft1000dev, u16* Data, u16 nRegIndx);

int ft1000_write_register(struct ft1000_device *ft1000dev, u16 value, u16 nRegIndx);

int ft1000_read_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 ft1000_read_dpram16(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer, u8 highlow);

int ft1000_write_dpram16(struct ft1000_device *ft1000dev, u16 indx, u16 value, u8 highlow);

int fix_ft1000_read_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer);

int fix_ft1000_write_dpram32(struct ft1000_device *ft1000dev, u16 indx, u8 *buffer);



extern void *pFileStart;

extern size_t FileLength;