From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, FSL_NEW_HELO_USER,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B55EC433EF for ; Sat, 4 Sep 2021 12:14:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25383600D4 for ; Sat, 4 Sep 2021 12:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236416AbhIDMPx (ORCPT ); Sat, 4 Sep 2021 08:15:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236349AbhIDMPw (ORCPT ); Sat, 4 Sep 2021 08:15:52 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56F7CC061575 for ; Sat, 4 Sep 2021 05:14:51 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id r2so1722881pgl.10 for ; Sat, 04 Sep 2021 05:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=yWbmcQlOamqknzkTVRblnZufvJwZB9dtwXewZ/RdYJE=; b=E2GiGl1AzGZqAOlfyQF05ZTAd0sDQN/1wvSR5EwI2oflUzBM+K3Q4QHB3gMvWxBfCC JkeVl+rtl56DrkOUlSQBC71lpX/+HY1bZYb8WVlxJ6t+ce8GgoTqzo9l31ngnL3Blj7J 3/u3HtGvkFcVWeR4oNUbtWxQrlqob/giohrQi0l/N4vaVqF7C9D7A/7gnvrOaoJ5nIb5 OVZdIYqF/lS7r4DWH+5oJHPKNAgrPODm1phPU+sm48G+g8CJmpS6gFO/UTLG60XaZez+ rN2g1iYe1xRKp8ANseJL7RZoqNe6vf7FPi1Po60OutMMyiPDbitDbDUj6geVXwIRXmT6 9R/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=yWbmcQlOamqknzkTVRblnZufvJwZB9dtwXewZ/RdYJE=; b=POvMCohy71b+BzYLYY9qDPZK2IdUvexaQka8s4nopF406tnSwNB1T6vZYvEpkv+90v q5PbAZJ53s+nZtBhd1K0o3fjkbQJySqigDwV7ClL81vMzX+43n8mGgmxN04KO4PMiHji Yajdt3dIm8Q/pGUEbHfQvQ6dUeVptiffC3xeEJIcnGzpYCY9FGuEQKrpZLuZaL7hS898 M1D7LbDNYkc3YoibsyvchjnMYXjBPTrhgoBYpQYDVoeP+YbjzCqaP4KVx4WLwP1kW5J4 FIEtqS3eoGS0+AIqBycWo8epa6Fc7R7d8FNgU2nK3cVQieKmyaIpt6ES33o09eX4EYIl fH5A== X-Gm-Message-State: AOAM530mMD/M+Y289hQlnEixNbuvmlMOKXNk69LEe3EUs2f6kuPuuN5n xBg/RcMpvVpBlUvrdbnkqkmqcIJVrvmVtxWH X-Google-Smtp-Source: ABdhPJwVpcX0RMlQ+8VbEVUvJ6RS+QyZjiQFeCrTOiBXf4Aw1eADDGx8ypfja20dKjfrBRqkhXf+hA== X-Received: by 2002:a05:6a00:2410:b0:409:5fbd:cb40 with SMTP id z16-20020a056a00241000b004095fbdcb40mr7679981pfh.8.1630757690667; Sat, 04 Sep 2021 05:14:50 -0700 (PDT) Received: from user ([117.98.200.228]) by smtp.gmail.com with ESMTPSA id o10sm2481631pgp.68.2021.09.04.05.14.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Sep 2021 05:14:50 -0700 (PDT) Date: Sat, 4 Sep 2021 17:44:44 +0530 From: Saurav Girepunje To: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, gregkh@linuxfoundation.org, saurav.girepunje@gmail.com, straube.linux@gmail.com, martin@kaiser.cx, nathan@kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: saurav.girepunje@hotmail.com Subject: [PATCH v2] staging: r8188eu: os_dep: simplifiy the rtw_resume function Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove unused variable ret and pwrpriv. Remove the condition with no effect (if == else) in usb_intf.c file. Remove rtw_resume_process() and move whole thing to rtw_resume(). Signed-off-by: Saurav Girepunje --- ChangeLog V2: - Remove rtw_resume_process() and move whole thing to rtw_resume(). --- drivers/staging/r8188eu/include/usb_osintf.h | 2 -- drivers/staging/r8188eu/os_dep/usb_intf.c | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging/r8188eu/include/usb_osintf.h index d1a1f739309c..34229b1cb081 100644 --- a/drivers/staging/r8188eu/include/usb_osintf.h +++ b/drivers/staging/r8188eu/include/usb_osintf.h @@ -24,6 +24,4 @@ void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr, void nat25_db_expire(struct adapter *priv); int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method); -int rtw_resume_process(struct adapter *padapter); - #endif diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c index bb85ab77fd26..77b03e7631b7 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -493,18 +493,6 @@ static int rtw_resume(struct usb_interface *pusb_intf) { struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); struct adapter *padapter = dvobj->if1; - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; - int ret = 0; - - if (pwrpriv->bInternalAutoSuspend) - ret = rtw_resume_process(padapter); - else - ret = rtw_resume_process(padapter); - return ret; -} - -int rtw_resume_process(struct adapter *padapter) -{ struct net_device *pnetdev; struct pwrctrl_priv *pwrpriv = NULL; int ret = -1; -- 2.32.0