Re: [PATCH v2] e1000e: Assign true and false to bool type variable instead of 1 and 0

[Michael Wang <wangyun@linux.vnet.ibm.com>]

On 12/07/2011 02:19 PM, Joe Perches wrote:

> On Wed, 2011-12-07 at 14:08 +0800, Michael Wang wrote:
>> I'm not good at script, if you are interested, we can work together to
>> fix all the remain cases, and send out some patches.
> 
> You should try coccinelle and spatch.
> 

Hi, Joe

I have not used coccinelle and spatch before, I will study on them later.

> If you run the script, this is the intel output.
> 
>  drivers/net/ethernet/intel/e1000/e1000_main.c |   10 +++++-----
>  drivers/net/ethernet/intel/ixgb/ixgb_main.c   |    2 +-
>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    2 +-
>  drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c  |    4 ++--
>  4 files changed, 9 insertions(+), 9 deletions(-)


We can try to fix them, thanks for the suggestion.

Regards,
Michael Wang

> 
> diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
> index 82f4ef1..5526881 100644
> --- a/drivers/net/ethernet/intel/e1000/e1000_main.c
> +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
> @@ -1185,7 +1185,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
>  		if (global_quad_port_a != 0)
>  			adapter->eeprom_wol = 0;
>  		else
> -			adapter->quad_port_a = 1;
> +			adapter->quad_port_a = true;
>  		/* Reset for multiple quad port adapters */
>  		if (++global_quad_port_a == 4)
>  			global_quad_port_a = 0;
> @@ -1679,7 +1679,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
>  	 * need this to apply a workaround later in the send path. */
>  	if (hw->mac_type == e1000_82544 &&
>  	    hw->bus_type == e1000_bus_type_pcix)
> -		adapter->pcix_82544 = 1;
> +		adapter->pcix_82544 = true;
> 
>  	ew32(TCTL, tctl);
> 
> @@ -2002,7 +2002,7 @@ static void e1000_clean_tx_ring(struct e1000_adapter *adapter,
> 
>  	tx_ring->next_to_use = 0;
>  	tx_ring->next_to_clean = 0;
> -	tx_ring->last_tx_tso = 0;
> +	tx_ring->last_tx_tso = false;
> 
>  	writel(0, hw->hw_addr + tx_ring->tdh);
>  	writel(0, hw->hw_addr + tx_ring->tdt);
> @@ -2851,7 +2851,7 @@ static int e1000_tx_map(struct e1000_adapter *adapter,
>  		 * DMA'd to the controller */
>  		if (!skb->data_len && tx_ring->last_tx_tso &&
>  		    !skb_is_gso(skb)) {
> -			tx_ring->last_tx_tso = 0;
> +			tx_ring->last_tx_tso = false;
>  			size -= 4;
>  		}
> 
> @@ -3219,7 +3219,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
> 
>  	if (likely(tso)) {
>  		if (likely(hw->mac_type != e1000_82544))
> -			tx_ring->last_tx_tso = 1;
> +			tx_ring->last_tx_tso = true;
>  		tx_flags |= E1000_TX_FLAGS_TSO;
>  	} else if (likely(e1000_tx_csum(adapter, tx_ring, skb)))
>  		tx_flags |= E1000_TX_FLAGS_CSUM;
> diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
> index 247cf92..7fc6073 100644
> --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
> +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
> @@ -228,7 +228,7 @@ ixgb_up(struct ixgb_adapter *adapter)
>  	if (IXGB_READ_REG(&adapter->hw, STATUS) & IXGB_STATUS_PCIX_MODE) {
>  		err = pci_enable_msi(adapter->pdev);
>  		if (!err) {
> -			adapter->have_msi = 1;
> +			adapter->have_msi = true;
>  			irq_flags = 0;
>  		}
>  		/* proceed to try to request regular interrupt */
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> index 1b28ed9..e8da825 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> @@ -4019,7 +4019,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
> 
>  		/* Mark all the VFs as inactive */
>  		for (i = 0 ; i < adapter->num_vfs; i++)
> -			adapter->vfinfo[i].clear_to_send = 0;
> +			adapter->vfinfo[i].clear_to_send = false;
> 
>  		/* ping all the active vfs to let them know we are going down */
>  		ixgbe_ping_all_vfs(adapter);
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
> index 9a56fd7..2c2a341 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
> @@ -1646,9 +1646,9 @@ static bool ixgbe_get_i2c_data(u32 *i2cctl)
>  	bool data;
> 
>  	if (*i2cctl & IXGBE_I2C_DATA_IN)
> -		data = 1;
> +		data = true;
>  	else
> -		data = 0;
> +		data = false;
> 
>  	return data;
>  }
> 
>