From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 B9C431366 for ; Sat, 2 Apr 2022 09:23:42 +0000 (UTC) Received: by mail-ed1-f48.google.com with SMTP id b24so5515819edu.10 for ; Sat, 02 Apr 2022 02:23:42 -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=YYft2sVX3IyvMb409T7bGyIltinifxK7HKRWoSehlTM=; b=fYFpSp3Vy5HlvCtf3vpmqt9If72x33fvBQA08FDCU+mwbVJiMNJ+FGlPYntyxsgGsD 84dZYnjVzldZMSO8vDInElRhVXMJmf79O94hQerYtywVDpOBW/Ab4l11kKnYiuaq9MIZ 4xPqav+ja09C3Cp5BzCQcvYPxC4Vtv22GjVjY8M9L1bbQb/8CbMeYWzCPbXsLu2GPsJL CVT3Zl3E2Om/nGadiUclKOe6TwY9PSd4uuQJ9vzGDyBxE/3kyb/l8qCjHFH7/8xEUF2q a1/cFn5j24Ov/19O7eNs/467SQzlZl+c5TAlMxTC2KJO1c1C2PxSpa11PJtRwp5UjKFD sP+g== 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=YYft2sVX3IyvMb409T7bGyIltinifxK7HKRWoSehlTM=; b=SC2EFLZy37sMfrwaKukKGDEBv2UA9ehMTHapQNMO40qxAhJQwStha1o4YP2AVqtewi uWdYjHK0ajnQAmh4bDjrHXyw/vcxsJzsO952niC7DaphT8yeNfYFBhAyL+rHP/++QkaC Jv0BsfXoRLl4Pz3i/VTNHbdnYqBJHwwj+35aIMlHdXHrjZc1K+sovxJkYp96NbBAbpK7 hCP028CbAj6QwaUkd/YDggEueu7/4r0xz8TOAjqrrX+RegQHT48ek85GzrZsm2ERNEaz nt1ivkcpLF8lFE7wHx98+kadlVnXYjOmq6Hq8p775Gc7p/uu+fgy73qEOCbZ3ZU+FvFn /6Tw== X-Gm-Message-State: AOAM5335nBtjRtFvBTh9+2UB0D+23Ba2ExfIqWzIxcSyuINgnSgrCghA yreHJIu5pdF0llcSPTbMyro= X-Google-Smtp-Source: ABdhPJyomnaPNSKug4pGhCvWr9Ivk7HdNe5zQBeHGSOuQabe7cB6mCLgmitBbafVm1KUz7sB1dmzyg== X-Received: by 2002:a50:d90f:0:b0:418:8a5a:14b2 with SMTP id t15-20020a50d90f000000b004188a5a14b2mr24302277edj.241.1648891421150; Sat, 02 Apr 2022 02:23:41 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id jv19-20020a170907769300b006e095c047d6sm1897679ejc.109.2022.04.02.02.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 02:23:40 -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 4/7] staging: r8188eu: remove HW_VAR_ANTENNA_DIVERSITY_SELECT from SetHwReg8188EU() Date: Sat, 2 Apr 2022 11:23:29 +0200 Message-Id: <20220402092332.6627-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402092332.6627-1-straube.linux@gmail.com> References: <20220402092332.6627-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 Remove the HW_VAR_ANTENNA_DIVERSITY_SELECT case from SetHwReg8188EU() and move its functionality to rtw_cmd.c where it is actually used. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_cmd.c | 8 +++++++- drivers/staging/r8188eu/hal/usb_halinit.c | 13 ------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c index 4fda2fe07ecc..a9152db589c7 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -1086,7 +1086,13 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time) static void antenna_select_wk_hdl(struct adapter *padapter, u8 antenna) { - SetHwReg8188EU(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna)); + struct hal_data_8188e *haldata = &padapter->haldata; + + /* switch current antenna to optimum antenna */ + if (haldata->CurAntenna != antenna) { + ODM_UpdateRxIdleAnt_88E(&haldata->odmpriv, antenna == 2 ? MAIN_ANT : AUX_ANT); + haldata->CurAntenna = antenna; + } } u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 7b231e9a2193..39db038d75fd 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1181,19 +1181,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) ODM_RA_Set_TxRPT_Time(podmpriv, min_rpt_time); } break; - case HW_VAR_ANTENNA_DIVERSITY_SELECT: - { - u8 Optimum_antenna = (*(u8 *)val); - u8 Ant; - /* switch antenna to Optimum_antenna */ - if (haldata->CurAntenna != Optimum_antenna) { - Ant = (Optimum_antenna == 2) ? MAIN_ANT : AUX_ANT; - ODM_UpdateRxIdleAnt_88E(&haldata->odmpriv, Ant); - - haldata->CurAntenna = Optimum_antenna; - } - } - break; case HW_VAR_FIFO_CLEARN_UP: { struct pwrctrl_priv *pwrpriv = &Adapter->pwrctrlpriv; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index c18ff1469c2b..1ba2eb0a46b2 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -25,7 +25,6 @@ enum hw_variables { HW_VAR_H2C_FW_JOINBSSRPT, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, HW_VAR_INITIAL_GAIN, - HW_VAR_ANTENNA_DIVERSITY_SELECT, HW_VAR_FIFO_CLEARN_UP, HW_VAR_RPT_TIMER_SETTING, HW_VAR_H2C_MEDIA_STATUS_RPT, -- 2.35.1