From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3FC593FD1 for ; Fri, 24 Sep 2021 12:27:50 +0000 (UTC) Received: by mail-ed1-f42.google.com with SMTP id dj4so35530808edb.5 for ; Fri, 24 Sep 2021 05:27:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sBjmp+TdyCNRpmkBBM6vbsQ1ywbXn3Qo6qFKStjh4lE=; b=oU0NVcP9eafIOjc22+oWqAFJVOIm3vWT69oEKuBqNFdBkdNa8HD20hg65xm6kWO/GO xcRY2z0iwPhfYWxFXdrY7BKgdtn8FhuBbbEzwBRMJGmdnF/fo4OybwymemoLAK+CWog4 bXN5XT5OwBXc/Uhu26/EZeGtuQzUALLq4WC1RgUrbJ/PRRfMm8poh1FfR1HZpWMB37z4 sWEOdK0+OD260W72/lVo13tmwVHzs2u06iGXazR9j3haiQyfWPN/BkGL3tHzKxBmlL3K C6V/rg+ycpP1rW0GyR73upUsFnvJywHFwQFXWHilzCD12v32Zr4OSaAWJ3ecUPXOM/mn WaOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sBjmp+TdyCNRpmkBBM6vbsQ1ywbXn3Qo6qFKStjh4lE=; b=swZMM8f6Thv08Un+uoaBNBHAYZaQWfUxb6sbhcqSQ/VWKMsVE+5LktPoCC3EAPkX4/ jOL/G6GgWMlepJMhEnadEVq123fg3beHsnK49mctg3GrxeE3lhGQe+1q69k6obrsKpOa 7RMWkfDOIAf32lvjB5HF5Pe4EVGDJXbvJrLL+B/4raplSufxBd+enkJBLbCNHG/BlPVi OP7Q76rHif/ZX9bgd6tsdeCTRhs8nhYoi+IHZZi02mYzX/xuHLrfiBX4oEDvaE8uyq/i RuuweqBAfgHi4Lj5bPE4JBjejKQIjBjcc5nvYYlmGjCg/iRRMA2Z11kbNYR0JDP1wk/R wpWA== X-Gm-Message-State: AOAM531gCLO/iAfxGKm63zn5a7EI3eCzynzfOWVdtZWekWVtlw9WJx6+ MhkBqbFQwtrRNV3SBMihKAA= X-Google-Smtp-Source: ABdhPJwIJeZ61yVikAO01doJXhH+drHjzLX5Mdlp5hVh2z9OYb2PC1kkMxP+2wUPfXF8Fn0Q92XmoQ== X-Received: by 2002:a50:bec8:: with SMTP id e8mr4738289edk.231.1632486468586; Fri, 24 Sep 2021 05:27:48 -0700 (PDT) Received: from localhost.localdomain.it (host-212-171-30-160.retail.telecomitalia.it. [212.171.30.160]) by smtp.gmail.com with ESMTPSA id v13sm4882522ejh.62.2021.09.24.05.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 05:27:48 -0700 (PDT) From: "Fabio M. De Francesco" To: Greg Kroah-Hartman , Larry Finger , Phillip Potter , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, David Laight , Dan Carpenter , Michael Straube , Martin Kaiser Cc: "Fabio M . De Francesco" Subject: [PATCH v10 16/16] staging: r8188eu: remove mutex 'usb_vendor_req_mutex' Date: Fri, 24 Sep 2021 14:27:05 +0200 Message-Id: <20210924122705.3781-17-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210924122705.3781-1-fmdefrancesco@gmail.com> References: <20210924122705.3781-1-fmdefrancesco@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Pavel Skripkin Remove mutex 'usb_vendor_req_mutex'. It was used to protect a shared buffer for USB requests and, since that buffer is removed in previous patch, this mutex is now useless. Furthermore, because it was used to serialize the calls to the Core USB API, we thoroughly tested the enabling of concurrent firing of USB requests without the mutex and found no problems of any kind in common use cases. Co-developed-by: Fabio M. De Francesco Signed-off-by: Fabio M. De Francesco Signed-off-by: Pavel Skripkin --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 30 ++++++--------------- drivers/staging/r8188eu/os_dep/usb_intf.c | 24 ----------------- 2 files changed, 8 insertions(+), 46 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 3ede93cd68d6..c15a75513c8c 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -16,12 +16,8 @@ static int usb_read(struct intf_hdl *intf, u16 value, void *data, u8 size) int status; u8 io_buf[4]; - mutex_lock(&dvobjpriv->usb_vendor_req_mutex); - - if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx) { - status = -EPERM; - goto mutex_unlock; - } + if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx) + return -EPERM; status = usb_control_msg_recv(udev, 0, REALTEK_USB_VENQT_CMD_REQ, REALTEK_USB_VENQT_READ, value, @@ -39,7 +35,7 @@ static int usb_read(struct intf_hdl *intf, u16 value, void *data, u8 size) * exist or is not enabled. */ adapt->bSurpriseRemoved = true; - goto mutex_unlock; + return status; } if (status < 0) { @@ -49,15 +45,12 @@ static int usb_read(struct intf_hdl *intf, u16 value, void *data, u8 size) if (rtw_inc_and_chk_continual_urb_error(dvobjpriv)) adapt->bSurpriseRemoved = true; - goto mutex_unlock; + return status; } rtw_reset_continual_urb_error(dvobjpriv); memcpy(data, io_buf, size); -mutex_unlock: - mutex_unlock(&dvobjpriv->usb_vendor_req_mutex); - return status; } @@ -69,12 +62,8 @@ static int usb_write(struct intf_hdl *intf, u16 value, void *data, u8 size) int status; u8 io_buf[VENDOR_CMD_MAX_DATA_LEN]; - mutex_lock(&dvobjpriv->usb_vendor_req_mutex); - - if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx) { - status = -EPERM; - goto mutex_unlock; - } + if (adapt->bSurpriseRemoved || adapt->pwrctrlpriv.pnp_bstop_trx) + return -EPERM; memcpy(io_buf, data, size); status = usb_control_msg_send(udev, 0, REALTEK_USB_VENQT_CMD_REQ, @@ -93,7 +82,7 @@ static int usb_write(struct intf_hdl *intf, u16 value, void *data, u8 size) * exist or is not enabled. */ adapt->bSurpriseRemoved = true; - goto mutex_unlock; + return status; } if (status < 0) { @@ -103,14 +92,11 @@ static int usb_write(struct intf_hdl *intf, u16 value, void *data, u8 size) if (rtw_inc_and_chk_continual_urb_error(dvobjpriv)) adapt->bSurpriseRemoved = true; - goto mutex_unlock; + return status; } rtw_reset_continual_urb_error(dvobjpriv); -mutex_unlock: - mutex_unlock(&dvobjpriv->usb_vendor_req_mutex); - return status; } diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c index 5ab42d55207f..1f51f96e4dfe 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -73,21 +73,9 @@ static struct rtw_usb_drv rtl8188e_usb_drv = { static struct rtw_usb_drv *usb_drv = &rtl8188e_usb_drv; -static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj) -{ - mutex_init(&dvobj->usb_vendor_req_mutex); - return _SUCCESS; -} - -static void rtw_deinit_intf_priv(struct dvobj_priv *dvobj) -{ - mutex_destroy(&dvobj->usb_vendor_req_mutex); -} - static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf) { int i; - int status = _FAIL; struct dvobj_priv *pdvobjpriv; struct usb_host_config *phost_conf; struct usb_config_descriptor *pconf_desc; @@ -146,23 +134,12 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf) DBG_88E("NON USB_SPEED_HIGH\n"); } - if (rtw_init_intf_priv(pdvobjpriv) == _FAIL) - goto free_dvobj; - /* 3 misc */ sema_init(&pdvobjpriv->usb_suspend_sema, 0); rtw_reset_continual_urb_error(pdvobjpriv); usb_get_dev(pusbd); - status = _SUCCESS; - -free_dvobj: - if (status != _SUCCESS && pdvobjpriv) { - usb_set_intfdata(usb_intf, NULL); - kfree(pdvobjpriv); - pdvobjpriv = NULL; - } exit: return pdvobjpriv; } @@ -188,7 +165,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf) usb_reset_device(interface_to_usbdev(usb_intf)); } } - rtw_deinit_intf_priv(dvobj); kfree(dvobj); } -- 2.33.0