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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABFCAC433EF for ; Mon, 6 Sep 2021 18:25:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D8616103C for ; Mon, 6 Sep 2021 18:25:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244506AbhIFS0X (ORCPT ); Mon, 6 Sep 2021 14:26:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244369AbhIFS0L (ORCPT ); Mon, 6 Sep 2021 14:26:11 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAF09C061575 for ; Mon, 6 Sep 2021 11:25:05 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id r7so10511006edd.6 for ; Mon, 06 Sep 2021 11:25:05 -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=DZ+jGlU52R+dGiD1XqdEMOHCz9GkCMtVwRo9Px3Ek0c=; b=m06d4lIHDXED83hnAA6XTq6aR5dP235jhGMBDLKLaKXGo8oMb+2id88vFGqxvYcmsm QMgAwxzwtUMme3Ti+GGnA+1Qum4KU4sezDDUq7mt7kjX7Jj/bH4dw4bB1jx30OjkVUtv XMfYxncfvt6FphZX+575JwCTdhypaj4jtsDV0NM8/6OXQk/0pJcUVUDM0m/xdMmYwrhC E10OXdCEvxaIIFxOf3lRbWeElYTQ1Y4gItei+Il2mLUs+HApa6k0ilrdGQBZ0XKPK/TG N3BpY1K5vyYjswZpeLSKwFXttRb3K8bMMxfcjCyjbhjoD5Pnvuw9A6K/GcZpBGv2PXrq 4nyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DZ+jGlU52R+dGiD1XqdEMOHCz9GkCMtVwRo9Px3Ek0c=; b=gAZo4tgIuRnEUxOyWxjSTnGQ/OiYKwhkId5IhtRPOyZK+BWG63QK4l9P+WkcoX8RjE M0VvkbH1gMAgL2IL9hEe9voJXcJ0zEX559rfwoO+PNMH4SKd0lhCJZhs5MCnuu5VTaW9 8Xl/bDQl7hj6xeeq39WS+3hE7tqlasgIEYasn1m4v8n5NYtklxIY5J/jabmVaHuXuX+r /mKTTZXKWfLvQaa8YMTDhlN3OKgqe/WOmiJa4sR5bpD+rW2WqeaGlu4pEU5V9/OTaGbj DlYISRWl6Rddz14e6eEA4l5cOFTrm2g0/PsWA7gDvOXqtdIPlyiKXDpCS0Dq1/mstrRq sXFA== X-Gm-Message-State: AOAM533WpBgVAMuH7kbmKFz2oVDnnsPAzmTJEEb24vUlzUyVz6sTN6PJ IotSu3bV6tfW4gmEcOUAP/U= X-Google-Smtp-Source: ABdhPJwYiUfUnk0K1FdZi8N76qXIlQKQQzhQnKBogWXJKX64OXIR6UXa8T87iipZTOup4JdqvdSv4w== X-Received: by 2002:a05:6402:2806:: with SMTP id h6mr14375180ede.259.1630952704410; Mon, 06 Sep 2021 11:25:04 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::8fe1]) by smtp.gmail.com with ESMTPSA id s25sm4284492ejq.17.2021.09.06.11.25.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Sep 2021 11:25:04 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, martin@kaiser.cx, fmdefrancesco@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 04/40] staging: r8188eu: remove dm_deinit from hal_ops Date: Mon, 6 Sep 2021 20:24:02 +0200 Message-Id: <20210906182438.5417-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210906182438.5417-1-straube.linux@gmail.com> References: <20210906182438.5417-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 Remove dm_deinit from hal_ops and remove its wrapper rtw_hal_dm_deinit(). Call rtl8188e_deinit_dm_priv() directly instead. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/hal_intf.c | 7 ------- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 2 -- drivers/staging/r8188eu/include/hal_intf.h | 4 ---- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c index a3b3dd11ba6e..d467e734a699 100644 --- a/drivers/staging/r8188eu/hal/hal_intf.c +++ b/drivers/staging/r8188eu/hal/hal_intf.c @@ -12,13 +12,6 @@ void rtw_hal_free_data(struct adapter *adapt) adapt->HalFunc.free_hal_data(adapt); } -void rtw_hal_dm_deinit(struct adapter *adapt) -{ - /* cancel dm timer */ - if (adapt->HalFunc.dm_deinit) - adapt->HalFunc.dm_deinit(adapt); -} - u32 rtw_hal_power_on(struct adapter *adapt) { if (adapt->HalFunc.hal_power_on) diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c index 765c8c4321f1..355878ec270d 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -1784,8 +1784,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) { pHalFunc->free_hal_data = &rtl8188e_free_hal_data; - pHalFunc->dm_deinit = &rtl8188e_deinit_dm_priv; - pHalFunc->set_bwmode_handler = &PHY_SetBWMode8188E; pHalFunc->set_channel_handler = &PHY_SwChnl8188E; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index 7d502701be27..61f4a6bcb7dc 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -143,8 +143,6 @@ struct hal_ops { s32 (*init_recv_priv)(struct adapter *padapter); void (*free_recv_priv)(struct adapter *padapter); - void (*dm_deinit)(struct adapter *padapter); - void (*set_bwmode_handler)(struct adapter *padapter, enum ht_channel_width Bandwidth, u8 Offset); @@ -250,8 +248,6 @@ void rtl8188eu_init_default_value(struct adapter *adapt); void rtw_hal_free_data(struct adapter *padapter); -void rtw_hal_dm_deinit(struct adapter *padapter); - u32 rtw_hal_power_on(struct adapter *padapter); uint rtw_hal_init(struct adapter *padapter); uint rtw_hal_deinit(struct adapter *padapter); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c index c5dc02d30349..039c05ffbc57 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -913,7 +913,7 @@ void rtw_cancel_all_timer(struct adapter *padapter) _cancel_timer_ex(&padapter->recvpriv.signal_stat_timer); /* cancel dm timer */ - rtw_hal_dm_deinit(padapter); + rtl8188e_deinit_dm_priv(padapter); } u8 rtw_free_drv_sw(struct adapter *padapter) -- 2.33.0