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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DDC3C433EF for ; Wed, 29 Dec 2021 20:51:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232206AbhL2Uvw (ORCPT ); Wed, 29 Dec 2021 15:51:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232131AbhL2Uvg (ORCPT ); Wed, 29 Dec 2021 15:51:36 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD475C061574 for ; Wed, 29 Dec 2021 12:51:35 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id v7so46496667wrv.12 for ; Wed, 29 Dec 2021 12:51:35 -0800 (PST) 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=AVOyTdq/5dHYhqv/1i6ZsUz7g+g+c+tsXa1zpjG5d2M=; b=pG/SaO2m4P+jMZTnL5DxxiO7glcchCgRY6YHfgHidfeYsuHMzeOYbYpN39mX1jCDXS 7oJwQVT0d5I24OP6XXaojd7z5YNZOC5P6+QynUOZiVZV12iYdzsK0Vw8BqKEpGY5pLmw ldYpZslyw0GK6lKSZz274ivFxTZOmu26rVJS7f+sD/rOwOUpsO4a2cKn6FutwIjixnpv Ug6zm4sUiP1AxEUaFTkG3ViA2dsSVmKYYzlt9WSZjaqIn721F/IMVdXkEktrkYEAMOb8 v7DxeYX9b86yxgg5lkC3Q9n+SFkWFnxXD5K6r/Sfbi5qbk8rAazzjIkuxz+MeFbb1NGt HcTw== 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=AVOyTdq/5dHYhqv/1i6ZsUz7g+g+c+tsXa1zpjG5d2M=; b=x5Lz3bMXoQ0pxldgHoFYUJDZKTpiHL6w+nxKmdp/EYX4CykfS7/dSynHeanZoln9c2 8Lgle8VCv+qEToqa2T4jrvsm5q483yMz+19Pq/q/QqSrO+fw+v9vaDU2xJcArpIat4CA 78MlgVIqClI5i7KUGDENQN2AKlqJiwCGZPmHmXVgFYS+j0hn73CKBbT6SKxGb+2D5UVt hku6UgJkY5lgtdmLOWbIGHPz6Kpqe4LdFNRX99A75iXPLLayfhlrZpSvFVXciwgR+yF3 MltRP19WVbqHp+YUDHDGnegIE73PAUu7YJMw0vyu/rIOvGC+v40Az7QZkfCcpcqp3022 pAmQ== X-Gm-Message-State: AOAM532lvL7gFxM2hKvD0cafCOP7tywodh7a9kBk+qywHxAUexbOG46Q 1uWINJAPcuKb6oXTG79tijo= X-Google-Smtp-Source: ABdhPJwNdv9BCnMGV162yKJE8osChh8oCjvW4YA3On6EXThSBYkpwvwFS5BTJVluzEMewwCt8E5lrg== X-Received: by 2002:adf:fac9:: with SMTP id a9mr14673260wrs.172.1640811094345; Wed, 29 Dec 2021 12:51:34 -0800 (PST) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::6619]) by smtp.gmail.com with ESMTPSA id l12sm27421989wmq.2.2021.12.29.12.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Dec 2021 12:51:34 -0800 (PST) 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 11/32] staging: r8188eu: remove ODM_CompareMemory() Date: Wed, 29 Dec 2021 21:50:47 +0100 Message-Id: <20211229205108.26373-12-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211229205108.26373-1-straube.linux@gmail.com> References: <20211229205108.26373-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ODM_CompareMemory() is just a wrapper around memcmp(). Remove ODM_CompareMemory() and call memcmp() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 4 ++-- drivers/staging/r8188eu/hal/odm_interface.c | 5 ----- drivers/staging/r8188eu/include/odm_interface.h | 4 ---- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c index 5db8ea92046e..04e24beb0488 100644 --- a/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +++ b/drivers/staging/r8188eu/hal/HalPhyRf_8188e.c @@ -171,13 +171,13 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( for (i = 0; i < CCK_TABLE_SIZE; i++) { if (dm_odm->RFCalibrateInfo.bCCKinCH14) { - if (ODM_CompareMemory(dm_odm, (void *)&TempCCk, (void *)&CCKSwingTable_Ch14[i][2], 4) == 0) { + if (memcmp((void *)&TempCCk, (void *)&CCKSwingTable_Ch14[i][2], 4)) { CCK_index_old = (u8)i; dm_odm->BbSwingIdxCckBase = (u8)i; break; } } else { - if (ODM_CompareMemory(dm_odm, (void *)&TempCCk, (void *)&CCKSwingTable_Ch1_Ch13[i][2], 4) == 0) { + if (memcmp((void *)&TempCCk, (void *)&CCKSwingTable_Ch1_Ch13[i][2], 4)) { CCK_index_old = (u8)i; dm_odm->BbSwingIdxCckBase = (u8)i; break; diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c index 03a149069126..a70fda30a24f 100644 --- a/drivers/staging/r8188eu/hal/odm_interface.c +++ b/drivers/staging/r8188eu/hal/odm_interface.c @@ -4,8 +4,3 @@ #include "../include/odm_precomp.h" /* ODM IO Relative API. */ -/* ODM Memory relative API. */ -s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2, u32 length) -{ - return !memcmp(pBuf1, pBuf2, length); -} diff --git a/drivers/staging/r8188eu/include/odm_interface.h b/drivers/staging/r8188eu/include/odm_interface.h index d5a75dfe0f8e..ef96d577cfa5 100644 --- a/drivers/staging/r8188eu/include/odm_interface.h +++ b/drivers/staging/r8188eu/include/odm_interface.h @@ -12,8 +12,4 @@ typedef void (*RT_WORKITEM_CALL_BACK)(void *pContext); /* =========== EXtern Function Prototype */ -/* Memory Relative Function. */ -s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2, - u32 length); - #endif /* __ODM_INTERFACE_H__ */ -- 2.34.1