Re: [PATCH] drivers/net: convert & to &&

Joe Perches
2008-03-06T18:00:54Z

On Thu, 2008-03-06 at 18:41 +0100, Julia Lawall wrote:
> diff -u -p a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
> --- a/drivers/net/e1000/e1000_main.c 2008-02-20 22:09:26.000000000 +0100
> +++ b/drivers/net/e1000/e1000_main.c 2008-03-06 17:30:20.000000000 +0100
> @@ -3872,10 +3872,12 @@ e1000_intr_msi(int irq, void *data)
> adapter->total_tx_packets = 0;
> adapter->total_rx_packets = 0;
>
> - for (i = 0; i < E1000_MAX_INTR; i++)
> - if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
> - !e1000_clean_tx_irq(adapter, adapter->tx_ring)))
> + for (i = 0; i < E1000_MAX_INTR; i++) {
> + boolean_t c1 = adapter->clean_rx(adapter, adapter->rx_ring);
> + boolean_t c2 = e1000_clean_tx_irq(adapter, adapter->tx_ring);
> + if (unlikely(!c1 && !c2))
> break;
> + }

Perhaps also a s/boolean_t/bool/g kernel wide?

$ grep -wrl boolean_t *

drivers/net/e1000/e1000.h
drivers/net/e1000/e1000_ethtool.c
drivers/net/e1000/e1000_hw.c
drivers/net/e1000/e1000_hw.h
drivers/net/e1000/e1000_main.c
drivers/net/e1000/e1000_osdep.h
drivers/net/ixgb/ixgb.h
drivers/net/ixgb/ixgb_ee.c
drivers/net/ixgb/ixgb_ee.h
drivers/net/ixgb/ixgb_ethtool.c
drivers/net/ixgb/ixgb_hw.c
drivers/net/ixgb/ixgb_hw.h
drivers/net/ixgb/ixgb_main.c
drivers/net/ixgb/ixgb_osdep.h
fs/xfs/quota/xfs_dquot.c
fs/xfs/quota/xfs_qm.c
fs/xfs/quota/xfs_qm.h
fs/xfs/quota/xfs_qm_syscalls.c
fs/xfs/quota/xfs_trans_dquot.c
fs/xfs/xfs_ialloc.c
fs/xfs/xfs_ialloc.h
fs/xfs/xfs_inode.c
fs/xfs/xfs_inode.h
fs/xfs/xfs_log.c
fs/xfs/xfs_vfsops.c
fs/xfs/xfs_utils.c
fs/xfs/xfs_types.h
fs/xfs/xfs_vnodeops.c