]> Pileus Git - ~andy/linux/commitdiff
staging: brcm80211: Remove redundant unlikely()
authorTobias Klauser <tklauser@distanz.ch>
Thu, 9 Dec 2010 15:01:07 +0000 (16:01 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 10 Dec 2010 00:29:46 +0000 (16:29 -0800)
IS_ERR() already implies unlikely(), so it can be omitted here.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

index 0d7aa4adbb77bad3d05cdb21aec65d501e1c77aa..edf300d4ae700c85f302887a02d5bfd3e5b16f17 100644 (file)
@@ -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);