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

Commit 3db1cd5c authored by Rusty Russell's avatar Rusty Russell Committed by David S. Miller
Browse files

net: fix assignment of 0/1 to bool variables. 



DaveM said:
   Please, this kind of stuff rots forever and not using bool properly
   drives me crazy.

Joe Perches <joe@perches.com> gave me the spatch script:

	@@
	bool b;
	@@
	-b = 0
	+b = false
	@@
	bool b;
	@@
	-b = 1
	+b = true

I merely installed coccinelle, read the documentation and took credit.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a8e510f6

drivers/net/ethernet/broadcom/tg3.c

+4 −4
Original line number Diff line number Diff line
@@ -6425,13 +6425,13 @@ static bool tg3_tx_frag_set(struct tg3_napi *tnapi, u32 *entry, u32 *budget, 
	bool hwbug = false;



	if (tg3_flag(tp, SHORT_DMA_BUG) && len <= 8)

		hwbug = 1;

		hwbug = true;



	if (tg3_4g_overflow_test(map, len))

		hwbug = 1;

		hwbug = true;



	if (tg3_40bit_overflow_test(tp, map, len))

		hwbug = 1;

		hwbug = true;



	if (tp->dma_limit) {

		u32 prvidx = *entry;
@@ -6464,7 +6464,7 @@ static bool tg3_tx_frag_set(struct tg3_napi *tnapi, u32 *entry, u32 *budget, 
				*budget -= 1;

				*entry = NEXT_TX(*entry);

			} else {

				hwbug = 1;

				hwbug = true;

				tnapi->tx_buffers[prvidx].fragmented = false;

			}

		}

drivers/net/ethernet/brocade/bna/bnad.c

+3 −3
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ void 
bnad_cb_ethport_link_status(struct bnad *bnad,

			enum bna_link_status link_status)

{

	bool link_up = 0;

	bool link_up = false;



	link_up = (link_status == BNA_LINK_UP) || (link_status == BNA_CEE_UP);
@@ -3190,7 +3190,7 @@ bnad_pci_init(struct bnad *bnad, 
		goto disable_device;

	if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&

	    !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {

		*using_dac = 1;

		*using_dac = true;

	} else {

		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (err) {
@@ -3199,7 +3199,7 @@ bnad_pci_init(struct bnad *bnad, 
			if (err)

				goto release_regions;

		}

		*using_dac = 0;

		*using_dac = false;

	}

	pci_set_master(pdev);

	return 0;

drivers/net/ethernet/dec/tulip/de4x5.c

+2 −2
Original line number Diff line number Diff line
@@ -5191,7 +5191,7 @@ de4x5_parse_params(struct net_device *dev) 
    struct de4x5_private *lp = netdev_priv(dev);

    char *p, *q, t;



    lp->params.fdx = 0;

    lp->params.fdx = false;

    lp->params.autosense = AUTO;



    if (args == NULL) return;
@@ -5201,7 +5201,7 @@ de4x5_parse_params(struct net_device *dev) 
	t = *q;

	*q = '\0';



	if (strstr(p, "fdx") || strstr(p, "FDX")) lp->params.fdx = 1;

	if (strstr(p, "fdx") || strstr(p, "FDX")) lp->params.fdx = true;



	if (strstr(p, "autosense") || strstr(p, "AUTOSENSE")) {

	    if (strstr(p, "TP")) {

drivers/net/ethernet/intel/e1000/e1000_main.c

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

drivers/net/ethernet/intel/e1000e/netdev.c

+12 −12
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, 
	u32 length, staterr;

	unsigned int i;

	int cleaned_count = 0;

	bool cleaned = 0;

	bool cleaned = false;

	unsigned int total_rx_bytes = 0, total_rx_packets = 0;



	i = rx_ring->next_to_clean;
@@ -888,7 +888,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, 


		next_buffer = &rx_ring->buffer_info[i];



		cleaned = 1;

		cleaned = true;

		cleaned_count++;

		dma_unmap_single(&pdev->dev,

				 buffer_info->dma,
@@ -1157,7 +1157,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) 
		 * Detect a transmit hang in hardware, this serializes the

		 * check with the clearing of time_stamp and movement of i

		 */

		adapter->detect_tx_hung = 0;

		adapter->detect_tx_hung = false;

		if (tx_ring->buffer_info[i].time_stamp &&

		    time_after(jiffies, tx_ring->buffer_info[i].time_stamp

			       + (adapter->tx_timeout_factor * HZ)) &&
@@ -1192,7 +1192,7 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, 
	unsigned int i, j;

	u32 length, staterr;

	int cleaned_count = 0;

	bool cleaned = 0;

	bool cleaned = false;

	unsigned int total_rx_bytes = 0, total_rx_packets = 0;



	i = rx_ring->next_to_clean;
@@ -1218,7 +1218,7 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, 


		next_buffer = &rx_ring->buffer_info[i];



		cleaned = 1;

		cleaned = true;

		cleaned_count++;

		dma_unmap_single(&pdev->dev, buffer_info->dma,

				 adapter->rx_ps_bsize0, DMA_FROM_DEVICE);
@@ -4257,7 +4257,7 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) 
static bool e1000e_has_link(struct e1000_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;

	bool link_active = 0;

	bool link_active = false;

	s32 ret_val = 0;



	/*
@@ -4272,7 +4272,7 @@ static bool e1000e_has_link(struct e1000_adapter *adapter) 
			ret_val = hw->mac.ops.check_for_link(hw);

			link_active = !hw->mac.get_link_status;

		} else {

			link_active = 1;

			link_active = true;

		}

		break;

	case e1000_media_type_fiber:
@@ -4371,7 +4371,7 @@ static void e1000_watchdog_task(struct work_struct *work) 


	if (link) {

		if (!netif_carrier_ok(netdev)) {

			bool txb2b = 1;

			bool txb2b = true;



			/* Cancel scheduled suspend requests. */

			pm_runtime_resume(netdev->dev.parent);
@@ -4404,11 +4404,11 @@ static void e1000_watchdog_task(struct work_struct *work) 
			adapter->tx_timeout_factor = 1;

			switch (adapter->link_speed) {

			case SPEED_10:

				txb2b = 0;

				txb2b = false;

				adapter->tx_timeout_factor = 16;

				break;

			case SPEED_100:

				txb2b = 0;

				txb2b = false;

				adapter->tx_timeout_factor = 10;

				break;

			}
@@ -4544,7 +4544,7 @@ static void e1000_watchdog_task(struct work_struct *work) 
	e1000e_flush_descriptors(adapter);



	/* Force detection of hung controller every watchdog period */

	adapter->detect_tx_hung = 1;

	adapter->detect_tx_hung = true;



	/*

	 * With 82571 controllers, LAA may be overwritten due to controller
@@ -6208,7 +6208,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 


	/* Initialize link parameters. User can change them with ethtool */

	adapter->hw.mac.autoneg = 1;

	adapter->fc_autoneg = 1;

	adapter->fc_autoneg = true;

	adapter->hw.fc.requested_mode = e1000_fc_default;

	adapter->hw.fc.current_mode = e1000_fc_default;

	adapter->hw.phy.autoneg_advertised = 0x2f;