summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sun
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2017-09-26 15:14:15 +0200
committerDavid S. Miller <davem@davemloft.net>2017-09-26 10:15:44 -0700
commit2091c227fa855776aafffad7ecd25ac0734df1a0 (patch)
tree0a7021be332390ee1e3d5def39ac87208621be41 /drivers/net/ethernet/sun
parent92978ee801844b16180f2168ffffd05647da551a (diff)
downloadlinux-2091c227fa855776aafffad7ecd25ac0734df1a0.tar.bz2
ldmvsw: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sun')
-rw-r--r--drivers/net/ethernet/sun/ldmvsw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c
index 5b56c24b6ed2..5feeaa9f0a9e 100644
--- a/drivers/net/ethernet/sun/ldmvsw.c
+++ b/drivers/net/ethernet/sun/ldmvsw.c
@@ -307,7 +307,7 @@ static int vsw_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)
/* Get (or create) the vnet associated with this port */
vp = vsw_get_vnet(hp, vdev->mp, &handle);
- if (unlikely(IS_ERR(vp))) {
+ if (IS_ERR(vp)) {
err = PTR_ERR(vp);
pr_err("Failed to get vnet for vsw-port\n");
mdesc_release(hp);