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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C136EC433F5 for ; Thu, 7 Oct 2021 10:40:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9EF8761283 for ; Thu, 7 Oct 2021 10:40:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240994AbhJGKmJ (ORCPT ); Thu, 7 Oct 2021 06:42:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240916AbhJGKlv (ORCPT ); Thu, 7 Oct 2021 06:41:51 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AFD3C061762 for ; Thu, 7 Oct 2021 03:39:51 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id r18so17654640wrg.6 for ; Thu, 07 Oct 2021 03:39:51 -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=vhS2oauwcTbIVc13GVi1Gpn8ukjq7xSbYjS868HZNy4=; b=Ye2EmonxmTpR3IDZ3lbXdkqeJRNg/ZyGv45+Qp8aIdvevzdmEK4WtDeWS7wyqVt8Xz 58Xdf8dK/ihTmlZJ1SFIemMGIrmXcdCVeGgd0WBF7yCZbHOY9UP6GS9QGqV9X7105pTV RtzoUJGOJKJ8Z+6u/HE2NzDjgH6Th21BmYu0/EH7YXkc9ydL6o2iTj2qjK/aC1Xdl5Fn P40cCGFV3a4PqAUtiS7vbhKsMbHi12uEmahKxrcWbl8kWkP7KWm3k+GWUBlXKMi+NTr8 LYupil6B9RQ5t3o62phVxuZEnDPqOQRfaQDg/X1xEXdWErJsZKdfQHwgyoDs3YRuNs+u QtAA== 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=vhS2oauwcTbIVc13GVi1Gpn8ukjq7xSbYjS868HZNy4=; b=a35KKxbHFmzNETxzfe/sT6Q0VhDQ84v5UuEPomSm4TB61rtuq9iUKz4+ubTz3782hY 5Sbei9zLuL9Vmssf/BfN3qKaAX4I1YeGZpNr3JRoMSRbi27Q5G6w4hDOUG77QJeGZJvY J5TzMTifxHIaQF0hYYxI5BZS4GEhDiaeoBedL+yosIXwsehOFu2r48Mzhuu7rSe/j/4l FEemd2cycgXUhBEcuDK0XWO2HnNyVuparj3x+keuEBkH5TZ/KrLe0W2kRYCmp2Cp3YJE ipphp9SwRusQeDZNJ1h51gfBZf+u8IEajRLVVOLdkXfm6jhZgaAUNPsXSC2mWyX2SnRW LKvA== X-Gm-Message-State: AOAM532rsbGHvw2DV9+nehlSTYzHBczaA0sn3NGaA0qiUCdWH6AAmmOu pl1WvuE1xE01t0HW/KZsc0oIbicBdOs= X-Google-Smtp-Source: ABdhPJyKw5nMpOK3AC9ndagVkLmlkIk/4LcqgK7QoiCUd93rfzEDLuprxkkJiK43uGfKS19hT4WeWA== X-Received: by 2002:a05:600c:354f:: with SMTP id i15mr15801640wmq.146.1633603190215; Thu, 07 Oct 2021 03:39:50 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::5d0b]) by smtp.gmail.com with ESMTPSA id n14sm10224853wms.0.2021.10.07.03.39.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 03:39:49 -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 3/5] staging: r8188eu: remove hal_init from hal_ops Date: Thu, 7 Oct 2021 12:39:41 +0200 Message-Id: <20211007103943.8433-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211007103943.8433-1-straube.linux@gmail.com> References: <20211007103943.8433-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 hal_init from struct hal_ops and call rtl8188eu_hal_init() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/hal_intf.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 +-- drivers/staging/r8188eu/include/hal_intf.h | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c index 6f39fc04df9b..30ddf174e4df 100644 --- a/drivers/staging/r8188eu/hal/hal_intf.c +++ b/drivers/staging/r8188eu/hal/hal_intf.c @@ -12,7 +12,7 @@ uint rtw_hal_init(struct adapter *adapt) adapt->hw_init_completed = false; - status = adapt->HalFunc.hal_init(adapt); + status = rtl8188eu_hal_init(adapt); if (status == _SUCCESS) { adapt->hw_init_completed = true; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index f6b90de1d063..07a29a7cf61d 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -657,7 +657,7 @@ enum rt_rf_power_state RfOnOffDetect(struct adapter *adapt) return rfpowerstate; } /* HalDetectPwrDownMode */ -static u32 rtl8188eu_hal_init(struct adapter *Adapter) +u32 rtl8188eu_hal_init(struct adapter *Adapter) { u8 value8 = 0; u16 value16; @@ -2140,6 +2140,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) DBG_88E("cant not alloc memory for HAL DATA\n"); adapt->hal_data_sz = sizeof(struct hal_data_8188e); - halfunc->hal_init = &rtl8188eu_hal_init; halfunc->hal_deinit = &rtl8188eu_hal_deinit; } diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index 7d892bf496cc..1810197e81f6 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -122,7 +122,6 @@ enum hal_odm_variable { typedef s32 (*c2h_id_filter)(u8 id); struct hal_ops { - u32 (*hal_init)(struct adapter *padapter); u32 (*hal_deinit)(struct adapter *padapter); }; @@ -175,6 +174,8 @@ uint rtw_hal_init(struct adapter *padapter); uint rtw_hal_deinit(struct adapter *padapter); void rtw_hal_stop(struct adapter *padapter); +u32 rtl8188eu_hal_init(struct adapter *Adapter); + void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 level); void rtw_hal_clone_data(struct adapter *dst_adapt, struct adapter *src_adapt); -- 2.33.0