From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (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 2AB01ED1 for ; Sun, 10 Apr 2022 16:32:03 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id s21so7589981pgv.13 for ; Sun, 10 Apr 2022 09:32:03 -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=isbZTSF51sQ2FdPVyH6jc9Gphy+CzzvzSabiko7I6mc=; b=WQ6NrFWjgSROqckS7LZwaf2sC8rup0FYK90P5hEB5nGjeUppWwR2JJCEwHYN+LsJaP 02tCUiWEVQaC5PpKqlM0TpO6r1hmFEWQAVAmM4k5XNhtKOxhNoj+P5BiH/Rl8oCQDPlL pSM86wRl3fFr6cq/g2nj4LQeW4LiXhQyf4SDLjCAgzptOiKu3ul6+/4zlCh+lXcunRka Iol3zQQxHbbaP5q4QOsjOjbT/7chZVGCFFarKZzNDf1xqF3GAgnrT4cbH9xh5PZo5c5m 2mYdu/UZ9UtDfRKxLx1aCS58JQzhU9+vh03RQwl4XZkCoMk864dhvFNE2NBFBZRwiG2m vcTQ== 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=isbZTSF51sQ2FdPVyH6jc9Gphy+CzzvzSabiko7I6mc=; b=XrjzK8zZsqNFQgBr6ltBIXwI9JzSupHCgbFX67bVrCB0H5dXkA4Fs2u1I15/uLqRop Uh77y7MiPmmElgz03+Y+7PTnXk0/7Wgac0b4EvUCALq73jUWBt1gnc3eX8VJ2nZk5GLC zRdjfuOo4kheDjM/3b7j7bEbcZLqfXSbfSd/BMevnhQ9/UUJ5SJ+nbFzUqREaBkXRh4u jX/nWi5IS+GRuUfQV/7o1oeqx7lvcb09qUzUMbLeVO1lk6/TlQkfwRci1fDZljDhDAic CYXkiM1s+big2WmAn2hgsDNM9wym0P4GG1Is667eZs0ZdNp5d8+fH41iBACwM0okSEJy 4/1Q== X-Gm-Message-State: AOAM5308ZHVdHhrMdgowQNr8VCNVAXOCd7y2ELlRKChgW52HopNA27uH u6DwUITvKPnBZBH6UF1Rag4= X-Google-Smtp-Source: ABdhPJzsjuokRfZ4sVFRJ05ODDxjzY9aXs4YH+x2yITz4ZIwskSlkbJNeDFx2Fl7jlZhMBVV0LjyQA== X-Received: by 2002:a63:6c04:0:b0:398:54fb:5632 with SMTP id h4-20020a636c04000000b0039854fb5632mr22918201pgc.78.1649608322658; Sun, 10 Apr 2022 09:32:02 -0700 (PDT) Received: from makvihas.localhost.com ([2405:201:202b:15:606b:10e4:2085:6825]) by smtp.gmail.com with ESMTPSA id f12-20020a056a001acc00b004fb37ecc6b2sm31940021pfv.29.2022.04.10.09.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 09:32:02 -0700 (PDT) From: Vihas Makwana To: Larry Finger , Phillip Potter , Greg Kroah-Hartman , Michael Straube Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Dan Carpenter , Pavel Skripkin , Vihas Makwana Subject: [PATCH 4/6] staging: r8188eu: drop unnecessary wrapper rtw_dequeue_cmd Date: Sun, 10 Apr 2022 22:01:15 +0530 Message-Id: <20220410163117.3964-5-makvihas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220410163117.3964-1-makvihas@gmail.com> References: <20220410163117.3964-1-makvihas@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 Remove the unnecessary wrapper. The logic of rtw_dequeue_cmd can be moved to _rtw_dequeue_cmd. Signed-off-by: Vihas Makwana --- drivers/staging/r8188eu/core/rtw_cmd.c | 16 ++++------------ drivers/staging/r8188eu/include/rtw_cmd.h | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c index ac6e710e5..9d1beca43 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -121,10 +121,11 @@ static int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) return _SUCCESS; } -static struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) +struct cmd_obj *_rtw_dequeue_cmd(struct cmd_priv *pcmdpriv) { struct cmd_obj *obj; unsigned long flags; + struct __queue *queue = &pcmdpriv->cmd_queue; spin_lock_irqsave(&queue->lock, flags); if (list_empty(&queue->queue)) { @@ -178,15 +179,6 @@ u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) return res; } -struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv) -{ - struct cmd_obj *cmd_obj; - - cmd_obj = _rtw_dequeue_cmd(&pcmdpriv->cmd_queue); - - return cmd_obj; -} - void rtw_free_cmd_obj(struct cmd_obj *pcmd) { @@ -230,7 +222,7 @@ int rtw_cmd_thread(void *context) padapter->bSurpriseRemoved) break; - pcmd = rtw_dequeue_cmd(pcmdpriv); + pcmd = _rtw_dequeue_cmd(pcmdpriv); if (!pcmd) continue; @@ -280,7 +272,7 @@ int rtw_cmd_thread(void *context) /* free all cmd_obj resources */ do { - pcmd = rtw_dequeue_cmd(pcmdpriv); + pcmd = _rtw_dequeue_cmd(pcmdpriv); if (!pcmd) break; diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8188eu/include/rtw_cmd.h index 7edce0f88..d581deebb 100644 --- a/drivers/staging/r8188eu/include/rtw_cmd.h +++ b/drivers/staging/r8188eu/include/rtw_cmd.h @@ -77,7 +77,7 @@ struct c2h_evt_hdr { #define c2h_evt_exist(c2h_evt) ((c2h_evt)->id || (c2h_evt)->plen) u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); -struct cmd_obj *rtw_dequeue_cmd(struct cmd_priv *pcmdpriv); +struct cmd_obj *_rtw_dequeue_cmd(struct cmd_priv *pcmdpriv); void rtw_free_cmd_obj(struct cmd_obj *pcmd); int rtw_cmd_thread(void *context); -- 2.30.2