Return-path: Received: from mx1.zhaw.ch ([160.85.104.50]:64762 "EHLO mx1.zhaw.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102Ab0LIPIV (ORCPT ); Thu, 9 Dec 2010 10:08:21 -0500 From: Tobias Klauser To: Brett Rudley , Henry Ptasinski , Nohee Ko , Greg Kroah-Hartman Cc: linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org, kernel-janitors@vger.kernel.org Subject: [PATCH] staging: brcm80211: Remove redundant unlikely() Date: Thu, 9 Dec 2010 16:01:07 +0100 Message-Id: <1291906867-1485-1-git-send-email-tklauser@distanz.ch> Sender: linux-wireless-owner@vger.kernel.org List-ID: IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser --- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 0d7aa4a..edf300d 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -3196,7 +3196,7 @@ s32 wl_cfg80211_attach(struct net_device *ndev, void *data) } WL_DBG(("func %p\n", wl_cfg80211_get_sdio_func())); wdev = wl_alloc_wdev(sizeof(struct wl_iface), &wl_cfg80211_get_sdio_func()->dev); - if (unlikely(IS_ERR(wdev))) + if (IS_ERR(wdev)) return -ENOMEM; wdev->iftype = wl_mode_to_nl80211_iftype(WL_MODE_BSS); -- 1.7.0.4