From patchwork Wed Jan 16 15:16:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 10766247 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 97AD8746 for ; Wed, 16 Jan 2019 15:16:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 871D42EBDD for ; Wed, 16 Jan 2019 15:16:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B69E2EBE2; Wed, 16 Jan 2019 15:16:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3C832EBE6 for ; Wed, 16 Jan 2019 15:16:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391183AbfAPPQu (ORCPT ); Wed, 16 Jan 2019 10:16:50 -0500 Received: from shell.v3.sk ([90.176.6.54]:57057 "EHLO shell.v3.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387431AbfAPPQt (ORCPT ); Wed, 16 Jan 2019 10:16:49 -0500 Received: from localhost (localhost [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id 3216753FF1; Wed, 16 Jan 2019 16:16:47 +0100 (CET) Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id YEISScXpwlOm; Wed, 16 Jan 2019 16:16:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id A9DAD54068; Wed, 16 Jan 2019 16:16:39 +0100 (CET) X-Virus-Scanned: amavisd-new at zimbra.v3.sk Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 8f-VP_OfzLES; Wed, 16 Jan 2019 16:16:39 +0100 (CET) Received: from belphegor.brq.redhat.com (nat-pool-brq-t.redhat.com [213.175.37.10]) by zimbra.v3.sk (Postfix) with ESMTPSA id 1968953FF1; Wed, 16 Jan 2019 16:16:39 +0100 (CET) From: Lubomir Rintel To: Kalle Valo Cc: libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH] libertas: remove ifdef OLPC noise Date: Wed, 16 Jan 2019 16:16:19 +0100 Message-Id: <20190116151618.1972197-1-lkundrak@v3.sk> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP provides machine_is_olpc() stub for CONFIG_OLPC=n, compiler should just optimize the unneeded bits away. Signed-off-by: Lubomir Rintel --- drivers/net/wireless/marvell/libertas/if_usb.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/net/wireless/marvell/libertas/if_usb.c b/drivers/net/wireless/marvell/libertas/if_usb.c index 220dcdee8d2b..7b61c599948e 100644 --- a/drivers/net/wireless/marvell/libertas/if_usb.c +++ b/drivers/net/wireless/marvell/libertas/if_usb.c @@ -12,9 +12,7 @@ #include #include -#ifdef CONFIG_OLPC #include -#endif #define DRV_NAME "usb8xxx" @@ -174,13 +172,11 @@ static void if_usb_fw_timeo(struct timer_list *t) wake_up(&cardp->fw_wq); } -#ifdef CONFIG_OLPC static void if_usb_reset_olpc_card(struct lbs_private *priv) { printk(KERN_CRIT "Resetting OLPC wireless via EC...\n"); olpc_ec_cmd(0x25, NULL, 0, NULL, 0); } -#endif /** * if_usb_probe - sets the configuration values @@ -267,10 +263,8 @@ static int if_usb_probe(struct usb_interface *intf, priv->exit_deep_sleep = NULL; priv->reset_deep_sleep_wakeup = NULL; priv->is_polling = false; -#ifdef CONFIG_OLPC if (machine_is_olpc()) priv->reset_card = if_usb_reset_olpc_card; -#endif cardp->boot2_version = udev->descriptor.bcdDevice; @@ -395,10 +389,8 @@ static int if_usb_reset_device(struct if_usb_card *cardp) ret = usb_reset_device(cardp->udev); msleep(100); -#ifdef CONFIG_OLPC if (ret && machine_is_olpc()) if_usb_reset_olpc_card(NULL); -#endif return ret; } @@ -939,14 +931,12 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message) goto out; } -#ifdef CONFIG_OLPC if (machine_is_olpc()) { if (priv->wol_criteria == EHS_REMOVE_WAKEUP) olpc_ec_wakeup_clear(EC_SCI_SRC_WLAN); else olpc_ec_wakeup_set(EC_SCI_SRC_WLAN); } -#endif ret = lbs_suspend(priv); if (ret)