From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 26 Sep 2017 13:14:15 +0000 (+0200)
Subject: ldmvsw: Remove redundant unlikely()
X-Git-Tag: v4.15-rc1~84^2~628
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2091c227fa855776aafffad7ecd25ac0734df1a0;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c
index 5b56c24b6ed2e..5feeaa9f0a9e0 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);