Skip to content

Commit

Permalink
Staging: w35und: remove true/false boolean macros
Browse files Browse the repository at this point in the history 
Use the kernel built-in true and false boolean values instead of duplicating
them in the driver code.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Jan 6, 2009
1 parent 9ce9ed5 commit 279b6cc
Show file tree
Hide file tree
Showing 10 changed files with 92 additions and 110 deletions.
17 changes: 0 additions & 17 deletions drivers/staging/winbond/linux/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,6 @@
#define FAILURE 0


#ifndef true
#define true 1
#endif

#ifndef false
#define false 0
#endif

// PD43 20021108
#ifndef TRUE
#define TRUE 1
#endif

#ifndef FALSE
#define FALSE 0
#endif

#define STATUS_MEDIA_CONNECT 1
#define STATUS_MEDIA_DISCONNECT 0

Expand Down
70 changes: 35 additions & 35 deletions drivers/staging/winbond/linux/wb35reg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

extern void phy_calibration_winbond(hw_data_t *phw_data, u32 frequency);

// TRUE : read command process successfully
// FALSE : register not support
// true : read command process successfully
// false : register not support
// RegisterNo : start base
// pRegisterData : data point
// NumberOfData : number of register data
Expand All @@ -21,7 +21,7 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N

// Module shutdown
if (pHwData->SurpriseRemove)
return FALSE;
return false;

// Trying to use burst write function if use new hardware
UrbSize = sizeof(struct wb35_reg_queue) + DataSize + sizeof(struct usb_ctrlrequest);
Expand Down Expand Up @@ -58,15 +58,15 @@ Wb35Reg_BurstWrite(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterData, u8 N
// Start EP0VM
Wb35Reg_EP0VM_start(pHwData);

return TRUE;
return true;
} else {
if (urb)
usb_free_urb(urb);
if (reg_queue)
kfree(reg_queue);
return FALSE;
return false;
}
return FALSE;
return false;
}

void
Expand Down Expand Up @@ -112,8 +112,8 @@ Wb35Reg_Update(phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue)
}
}

// TRUE : read command process successfully
// FALSE : register not support
// true : read command process successfully
// false : register not support
unsigned char
Wb35Reg_WriteSync( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue )
{
Expand All @@ -122,7 +122,7 @@ Wb35Reg_WriteSync( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue )

// Module shutdown
if (pHwData->SurpriseRemove)
return FALSE;
return false;

RegisterValue = cpu_to_le32(RegisterValue);

Expand Down Expand Up @@ -150,14 +150,14 @@ Wb35Reg_WriteSync( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue )
#endif

pHwData->SurpriseRemove = 1; // 20060704.2
return FALSE;
return false;
}

return TRUE;
return true;
}

// TRUE : read command process successfully
// FALSE : register not support
// true : read command process successfully
// false : register not support
unsigned char
Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue )
{
Expand All @@ -170,7 +170,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue )

// Module shutdown
if (pHwData->SurpriseRemove)
return FALSE;
return false;

// update the register by send urb request------------------------------------
UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);
Expand All @@ -180,7 +180,7 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue )
reg_queue->DIRECT = 1;// burst write register
reg_queue->INDEX = RegisterNo;
reg_queue->VALUE = cpu_to_le32(RegisterValue);
reg_queue->RESERVED_VALID = FALSE;
reg_queue->RESERVED_VALID = false;
dr = (struct usb_ctrlrequest *)((u8 *)reg_queue + sizeof(struct wb35_reg_queue));
dr->bRequestType = USB_TYPE_VENDOR|USB_DIR_OUT |USB_RECIP_DEVICE;
dr->bRequest = 0x03; // USB or vendor-defined request code, burst mode
Expand All @@ -205,19 +205,19 @@ Wb35Reg_Write( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue )
// Start EP0VM
Wb35Reg_EP0VM_start(pHwData);

return TRUE;
return true;
} else {
if (urb)
usb_free_urb(urb);
kfree(reg_queue);
return FALSE;
return false;
}
}

//This command will be executed with a user defined value. When it completes,
//this value is useful. For example, hal_set_current_channel will use it.
// TRUE : read command process successfully
// FALSE : register not support
// true : read command process successfully
// false : register not support
unsigned char
Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue,
s8 *pValue, s8 Len)
Expand All @@ -230,7 +230,7 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register

// Module shutdown
if (pHwData->SurpriseRemove)
return FALSE;
return false;

// update the register by send urb request------------------------------------
UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);
Expand All @@ -242,7 +242,7 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register
reg_queue->VALUE = cpu_to_le32(RegisterValue);
//NOTE : Users must guarantee the size of value will not exceed the buffer size.
memcpy(reg_queue->RESERVED, pValue, Len);
reg_queue->RESERVED_VALID = TRUE;
reg_queue->RESERVED_VALID = true;
dr = (struct usb_ctrlrequest *)((u8 *)reg_queue + sizeof(struct wb35_reg_queue));
dr->bRequestType = USB_TYPE_VENDOR|USB_DIR_OUT |USB_RECIP_DEVICE;
dr->bRequest = 0x03; // USB or vendor-defined request code, burst mode
Expand All @@ -265,17 +265,17 @@ Wb35Reg_WriteWithCallbackValue( phw_data_t pHwData, u16 RegisterNo, u32 Register

// Start EP0VM
Wb35Reg_EP0VM_start(pHwData);
return TRUE;
return true;
} else {
if (urb)
usb_free_urb(urb);
kfree(reg_queue);
return FALSE;
return false;
}
}

// TRUE : read command process successfully
// FALSE : register not support
// true : read command process successfully
// false : register not support
// pRegisterValue : It must be a resident buffer due to asynchronous read register.
unsigned char
Wb35Reg_ReadSync( phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue )
Expand All @@ -286,7 +286,7 @@ Wb35Reg_ReadSync( phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue )

// Module shutdown
if (pHwData->SurpriseRemove)
return FALSE;
return false;

// Read the register by send usb message------------------------------------

Expand Down Expand Up @@ -317,14 +317,14 @@ Wb35Reg_ReadSync( phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue )
#endif

pHwData->SurpriseRemove = 1; // 20060704.2
return FALSE;
return false;
}

return TRUE;
return true;
}

// TRUE : read command process successfully
// FALSE : register not support
// true : read command process successfully
// false : register not support
// pRegisterValue : It must be a resident buffer due to asynchronous read register.
unsigned char
Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue )
Expand All @@ -337,7 +337,7 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue )

// Module shutdown
if (pHwData->SurpriseRemove)
return FALSE;
return false;

// update the variable by send Urb to read register ------------------------------------
UrbSize = sizeof(struct wb35_reg_queue) + sizeof(struct usb_ctrlrequest);
Expand Down Expand Up @@ -371,12 +371,12 @@ Wb35Reg_Read(phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue )
// Start EP0VM
Wb35Reg_EP0VM_start( pHwData );

return TRUE;
return true;
} else {
if (urb)
usb_free_urb( urb );
kfree(reg_queue);
return FALSE;
return false;
}
}

Expand Down Expand Up @@ -629,9 +629,9 @@ unsigned char Wb35Reg_initial(phw_data_t pHwData)
Dxx_initial(pHwData);

if (pHwData->SurpriseRemove)
return FALSE;
return false;
else
return TRUE; // Initial fail
return true; // Initial fail
}

//===================================================================================
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/winbond/linux/wb35rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ u16 Wb35Rx_indicate(phw_data_t pHwData)

// Reclaim resource
pWb35Rx->RxOwner[ RxBufferId ] = 1;
} while(TRUE);
} while (true);

return stmp2;
}
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/winbond/linux/wb35tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Wb35Tx_get_tx_buffer(phw_data_t pHwData, u8 **pBuffer)
PWB35TX pWb35Tx = &pHwData->Wb35Tx;

*pBuffer = pWb35Tx->TxBuffer[0];
return TRUE;
return true;
}

void Wb35Tx_start(phw_data_t pHwData)
Expand Down Expand Up @@ -136,16 +136,16 @@ unsigned char Wb35Tx_initial(phw_data_t pHwData)

pWb35Tx->Tx4Urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!pWb35Tx->Tx4Urb)
return FALSE;
return false;

pWb35Tx->Tx2Urb = usb_alloc_urb(0, GFP_ATOMIC);
if (!pWb35Tx->Tx2Urb)
{
usb_free_urb( pWb35Tx->Tx4Urb );
return FALSE;
return false;
}

return TRUE;
return true;
}

//======================================================
Expand Down Expand Up @@ -193,12 +193,12 @@ void Wb35Tx_destroy(phw_data_t pHwData)
void Wb35Tx_CurrentTime(phw_data_t pHwData, u32 TimeCount)
{
PWB35TX pWb35Tx = &pHwData->Wb35Tx;
unsigned char Trigger = FALSE;
unsigned char Trigger = false;

if (pWb35Tx->TxTimer > TimeCount)
Trigger = TRUE;
Trigger = true;
else if (TimeCount > (pWb35Tx->TxTimer+500))
Trigger = TRUE;
Trigger = true;

if (Trigger) {
pWb35Tx->TxTimer = TimeCount;
Expand Down
Loading

0 comments on commit 279b6cc

Please sign in to comment.