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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 D3197C4338F for ; Thu, 19 Aug 2021 06:08:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B868C61106 for ; Thu, 19 Aug 2021 06:08:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231235AbhHSGJU (ORCPT ); Thu, 19 Aug 2021 02:09:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229782AbhHSGJS (ORCPT ); Thu, 19 Aug 2021 02:09:18 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4F28C061756 for ; Wed, 18 Aug 2021 23:08:42 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id d11so10348036eja.8 for ; Wed, 18 Aug 2021 23:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dg8tJtA/mpAsn1Z5f0hfRAUxeWjHIlYjDakwDIUZfgw=; b=u2vpZhuPa0bk3gdpVB0eiZye4ynDqANT1dRqy4ZOTuxjj9vyqYql0QtIN8V3Dug6RF ov1xGDQMDrugzSENn49CLLTuk0x0Qey2TaoqYltbUm6N1S9Bnmr2qYfMSn0pVZEW9Jno JDBWCcffyRgMvntVVQWhe2KFeAMz3V1F9Oh24CEWS6JwK3SevoeqxUe8UVcJf6nKVwDB xW8PN2N715dC8vsHaef3aIbqr8rpFEjbI90nv98/aFDYtUsyRx9fapSgaLKzFs/ckW38 DHIUYPDw6Um4i0VHyvSrkAGuFc73bmAc8dausbC31mw8EaPt+VKL3HV/1rrg1ND6Cg7d 1ijA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dg8tJtA/mpAsn1Z5f0hfRAUxeWjHIlYjDakwDIUZfgw=; b=h3RmW8GOXgomczBAfs37c+QpJewJHADCRTsz59WgyyFJTpfzGNvCKjNLptvpSf3cUS zfrJZ83Exb0XXgATzkCRstEs2HSQwrEATTngpHuAKlX+z/7HSSiQsZBt0Yxwz0pY0Wjk AaFJyQCuoGBliDRQUBEf0A7cxZ4uK3VmbQFUE9bAg0q7KWi1zEZ3vIl7pVNCXpLaBbIE Z9QBDzzi11T9gseEnqP7zZP2SIkkr//EOAp8xOmPkYsh9qA0QpRFb7EkK5xzrp9f3KlQ bL1PJKfoszaaBAA0VljeIlDzmm99CENmNUEqWbHmuDGaKKjH8J7nqzNtGqdzJV2g3rPP BDDA== X-Gm-Message-State: AOAM5325zUdQDIPrFr1R5R5vxmqortxLT+FHnkEbKkSqjpodGPGQ2eyP maNltHdwhqOfvwPFqovxxow= X-Google-Smtp-Source: ABdhPJwvrvXtCMyC6m0oETTT/WyRaRS0cLIlYd5blZmuLKVVRpoHVI/4r05loVqnLr7ZOA18Ju242w== X-Received: by 2002:a17:906:1416:: with SMTP id p22mr13672241ejc.364.1629353321546; Wed, 18 Aug 2021 23:08:41 -0700 (PDT) Received: from localhost.localdomain (host-79-22-109-211.retail.telecomitalia.it. [79.22.109.211]) by smtp.gmail.com with ESMTPSA id d22sm782862ejk.5.2021.08.18.23.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 23:08:41 -0700 (PDT) From: "Fabio M. De Francesco" To: Greg Kroah-Hartman , Larry Finger , Phillip Potter , Martin Kaiser , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" Subject: [PATCH] staging: r8188eu: Remove _enter/_exit_critical_mutex() Date: Thu, 19 Aug 2021 08:08:37 +0200 Message-Id: <20210819060837.23983-1-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove _enter_critical_mutex() and _exit_critical_mutex(). They are unnecessary wrappers, respectively to mutex_lock_interruptible and to mutex_unlock(). They also have an odd interface that takes an unused second parameter "unsigned long *pirqL". Use directly the in-kernel API; check and manage the return value of mutex_lock_interruptible(). Signed-off-by: Fabio M. De Francesco --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 5 +++-- drivers/staging/r8188eu/hal/usb_ops_linux.c | 7 +++++-- drivers/staging/r8188eu/include/osdep_service.h | 13 ------------- drivers/staging/r8188eu/os_dep/os_intfs.c | 5 +++-- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c index f6ee72d5af09..484083468ebb 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -4358,7 +4358,8 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg if (padapter->bSurpriseRemoved || padapter->bDriverStopped) return -1; - _enter_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL); + if (mutex_lock_interruptible(&pxmitpriv->ack_tx_mutex)) + return -EINTR; pxmitpriv->ack_tx = true; pmgntframe->ack_report = 1; @@ -4367,7 +4368,7 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg } pxmitpriv->ack_tx = false; - _exit_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL); + mutex_unlock(&pxmitpriv->ack_tx_mutex); return ret; } diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 953fa05dc30c..52cb32f898e0 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -32,7 +32,10 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata, goto exit; } - _enter_critical_mutex(&dvobjpriv->usb_vendor_req_mutex, NULL); + if (mutex_lock_interruptible(&dvobjpriv->usb_vendor_req_mutex)) { + status = -EINTR; + goto exit; + } /* Acquire IO memory for vendorreq */ pIo_buf = dvobjpriv->usb_vendor_req_buf; @@ -96,7 +99,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata, break; } release_mutex: - _exit_critical_mutex(&dvobjpriv->usb_vendor_req_mutex, NULL); + mutex_unlock(&dvobjpriv->usb_vendor_req_mutex); exit: return status; } diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h index 029aa4e92c9b..bb92b9d74bd7 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -56,19 +56,6 @@ static inline struct list_head *get_list_head(struct __queue *queue) return (&(queue->queue)); } -static inline int _enter_critical_mutex(struct mutex *pmutex, unsigned long *pirqL) -{ - int ret; - - ret = mutex_lock_interruptible(pmutex); - return ret; -} - -static inline void _exit_critical_mutex(struct mutex *pmutex, unsigned long *pirqL) -{ - mutex_unlock(pmutex); -} - static inline void rtw_list_delete(struct list_head *plist) { list_del_init(plist); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c index 1aa65925e1da..4768e3a507f6 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -1065,9 +1065,10 @@ int netdev_open(struct net_device *pnetdev) int ret; struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); - _enter_critical_mutex(padapter->hw_init_mutex, NULL); + if (mutex_lock_interruptible(padapter->hw_init_mutex)) + return -EINTR; ret = _netdev_open(pnetdev); - _exit_critical_mutex(padapter->hw_init_mutex, NULL); + mutex_unlock(padapter->hw_init_mutex); return ret; } -- 2.32.0