diff options
author | Joe Perches <joe@perches.com> | 2013-09-01 23:32:33 -0400 |
---|---|---|
committer | Robert Love <robert.w.love@intel.com> | 2013-10-14 11:25:40 -0400 |
commit | 6942df7f775107b504f10de42c81971f514d718d (patch) | |
tree | 9abb29ea3ffe7f72d1d56b487fc5a31acc5af6eb /drivers/scsi/fnic | |
parent | 55d0ac5d2839fe270cea02fad44eed13750a0efd (diff) |
scsi: Convert uses of compare_ether_addr to ether_addr_equal
Preliminary to removing compare_ether_addr altogether:
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Diffstat (limited to 'drivers/scsi/fnic')
-rw-r--r-- | drivers/scsi/fnic/fnic_fcs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c index 006fa92a02df..902520c65387 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c | |||
@@ -651,13 +651,13 @@ void fnic_update_mac_locked(struct fnic *fnic, u8 *new) | |||
651 | 651 | ||
652 | if (is_zero_ether_addr(new)) | 652 | if (is_zero_ether_addr(new)) |
653 | new = ctl; | 653 | new = ctl; |
654 | if (!compare_ether_addr(data, new)) | 654 | if (ether_addr_equal(data, new)) |
655 | return; | 655 | return; |
656 | FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "update_mac %pM\n", new); | 656 | FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "update_mac %pM\n", new); |
657 | if (!is_zero_ether_addr(data) && compare_ether_addr(data, ctl)) | 657 | if (!is_zero_ether_addr(data) && !ether_addr_equal(data, ctl)) |
658 | vnic_dev_del_addr(fnic->vdev, data); | 658 | vnic_dev_del_addr(fnic->vdev, data); |
659 | memcpy(data, new, ETH_ALEN); | 659 | memcpy(data, new, ETH_ALEN); |
660 | if (compare_ether_addr(new, ctl)) | 660 | if (!ether_addr_equal(new, ctl)) |
661 | vnic_dev_add_addr(fnic->vdev, new); | 661 | vnic_dev_add_addr(fnic->vdev, new); |
662 | } | 662 | } |
663 | 663 | ||