From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 2C0F4653 for ; Wed, 31 Aug 2022 05:36:54 +0000 (UTC) Received: by mail-ej1-f53.google.com with SMTP id kk26so26165553ejc.11 for ; Tue, 30 Aug 2022 22:36:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=NOfWrLgk4XJRp02V6wb7t4ERG9KLrIB6EWwKvEYmHTY=; b=q3vo1pdqO4MDUp085vbr/x74o8yV1M3oVtMKQW32IH8QET4vp46nOdZFsgZYnlE4Eq DFUR8Mr0ujsg3pohQ9bHyeyxshmDK2QOG9zRxpVIS8cpmnUo9RHxE8AWKb2OV/OGQRuf YpStHVKowJWICs+AI/mEEpZY5KL4ucAVNow7choyKjB/iXJWjDW2x5v3gcC29WHLepXd YnGrNJz3MU7kkYV0aqw3+HrLsiRyRJNa8pv9pF5Z+ObNZWwWCN93zTqRDnrkfaBeSYub 2hlsR2Slqzv16wC7abn0/wNoJuzjbLtUalTkSgiZoIEKVxCJcscNYwb6FMmlUaHg7DTo lZCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=NOfWrLgk4XJRp02V6wb7t4ERG9KLrIB6EWwKvEYmHTY=; b=A7vZWrpPqrOXDmyZjgm5r86zvt92qoICEMDoj3XVsMq5HeS01f0dGZjAwnb71wtZfm sG8ynYy11lgAdLXoGfvmiXRlXljHwbQOGhv3nzRXEoJH/tpkvtzqJ7FL42QTSMCfmOb0 Pw2sPPRFpx8gRPGS5BmSKonhwsHDaR5z6BEWteufuOPFnJQGWClqNYP0BMi93YRxUf3h 7Ec2UxMD+cb0YcbGyWxxfsomvkQ8W3W4Hh2WEUkZ1DUYeTThF7ZaMP5EC93oHlB/h6T/ ggpfE53ID4tZ/J5qVYTavjPtUhZ5OIit1tm5LW96FJw0Z18tQyW1XNiqokTnvzqnO97E 5ckg== X-Gm-Message-State: ACgBeo0XDVs4DK2knJ2eA1SVr24uMpus7m6TMcPOD5D3KEshOapzd3yM Lz6M4w7QS0yKyV4dbIsBPcM= X-Google-Smtp-Source: AA6agR4yPeXKBgBg73i/NeASyese1jidXLXvrRg8eV8eAKCsgMOWDQpIFf5czudGRXrYTShs23uDiQ== X-Received: by 2002:a17:907:2cef:b0:741:4fbf:4628 with SMTP id hz15-20020a1709072cef00b007414fbf4628mr11490511ejc.334.1661924212448; Tue, 30 Aug 2022 22:36:52 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb89.dynamic.kabel-deutschland.de. [95.90.187.137]) by smtp.gmail.com with ESMTPSA id gh21-20020a1709073c1500b0073a644ef803sm6610135ejc.101.2022.08.30.22.36.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 22:36:52 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/2] staging: r8188eu: remove os_dep/mlme_linux.c Date: Wed, 31 Aug 2022 07:36:39 +0200 Message-Id: <20220831053639.8559-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220831053639.8559-1-straube.linux@gmail.com> References: <20220831053639.8559-1-straube.linux@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 The function rtw_init_mlme_timer() is only used in core/rtw_mlme.c. Move rtw_init_mlme_timer(), including the static functions it calls, to core/rtw_mlme.c and make it static. Remove the now empty file os_dep/mlme_linux.c. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/Makefile | 1 - drivers/staging/r8188eu/core/rtw_mlme.c | 31 ++++++++++++++++ drivers/staging/r8188eu/include/mlme_osdep.h | 2 - drivers/staging/r8188eu/os_dep/mlme_linux.c | 39 -------------------- 4 files changed, 31 insertions(+), 42 deletions(-) delete mode 100644 drivers/staging/r8188eu/os_dep/mlme_linux.c diff --git a/drivers/staging/r8188eu/Makefile b/drivers/staging/r8188eu/Makefile index afafe6957155..f5091a3ed4d2 100644 --- a/drivers/staging/r8188eu/Makefile +++ b/drivers/staging/r8188eu/Makefile @@ -22,7 +22,6 @@ r8188eu-y = \ hal/usb_halinit.o \ hal/usb_ops_linux.o \ os_dep/ioctl_linux.o \ - os_dep/mlme_linux.o \ os_dep/os_intfs.o \ os_dep/osdep_service.o \ os_dep/usb_intf.o \ diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c index bb317ba4bcd5..8f21d34a317f 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -189,6 +189,37 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) return ie + 8; } +static void rtw_join_timeout_handler(struct timer_list *t) +{ + struct adapter *adapter = from_timer(adapter, t, mlmepriv.assoc_timer); + + _rtw_join_timeout_handler(adapter); +} + +static void _rtw_scan_timeout_handler(struct timer_list *t) +{ + struct adapter *adapter = from_timer(adapter, t, mlmepriv.scan_to_timer); + + rtw_scan_timeout_handler(adapter); +} + +static void _dynamic_check_timer_handlder(struct timer_list *t) +{ + struct adapter *adapter = from_timer(adapter, t, mlmepriv.dynamic_chk_timer); + + rtw_dynamic_check_timer_handlder(adapter); + _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000); +} + +static void rtw_init_mlme_timer(struct adapter *padapter) +{ + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + + timer_setup(&pmlmepriv->assoc_timer, rtw_join_timeout_handler, 0); + timer_setup(&pmlmepriv->scan_to_timer, _rtw_scan_timeout_handler, 0); + timer_setup(&pmlmepriv->dynamic_chk_timer, _dynamic_check_timer_handlder, 0); +} + int rtw_init_mlme_priv(struct adapter *padapter)/* struct mlme_priv *pmlmepriv) */ { int i; diff --git a/drivers/staging/r8188eu/include/mlme_osdep.h b/drivers/staging/r8188eu/include/mlme_osdep.h index d5e367e2d0de..1fa66c5e3c9c 100644 --- a/drivers/staging/r8188eu/include/mlme_osdep.h +++ b/drivers/staging/r8188eu/include/mlme_osdep.h @@ -7,8 +7,6 @@ #include "osdep_service.h" #include "drv_types.h" -void rtw_init_mlme_timer(struct adapter *padapter); - void indicate_wx_scan_complete_event(struct adapter *padapter); #endif /* _MLME_OSDEP_H_ */ diff --git a/drivers/staging/r8188eu/os_dep/mlme_linux.c b/drivers/staging/r8188eu/os_dep/mlme_linux.c deleted file mode 100644 index 2f8f866d5362..000000000000 --- a/drivers/staging/r8188eu/os_dep/mlme_linux.c +++ /dev/null @@ -1,39 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 2007 - 2011 Realtek Corporation. i*/ - -#define _MLME_OSDEP_C_ - -#include "../include/osdep_service.h" -#include "../include/drv_types.h" -#include "../include/mlme_osdep.h" - -static void rtw_join_timeout_handler(struct timer_list *t) -{ - struct adapter *adapter = from_timer(adapter, t, mlmepriv.assoc_timer); - - _rtw_join_timeout_handler(adapter); -} - -static void _rtw_scan_timeout_handler(struct timer_list *t) -{ - struct adapter *adapter = from_timer(adapter, t, mlmepriv.scan_to_timer); - - rtw_scan_timeout_handler(adapter); -} - -static void _dynamic_check_timer_handlder(struct timer_list *t) -{ - struct adapter *adapter = from_timer(adapter, t, mlmepriv.dynamic_chk_timer); - - rtw_dynamic_check_timer_handlder(adapter); - _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000); -} - -void rtw_init_mlme_timer(struct adapter *padapter) -{ - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - - timer_setup(&pmlmepriv->assoc_timer, rtw_join_timeout_handler, 0); - timer_setup(&pmlmepriv->scan_to_timer, _rtw_scan_timeout_handler, 0); - timer_setup(&pmlmepriv->dynamic_chk_timer, _dynamic_check_timer_handlder, 0); -} -- 2.37.2