From nobody Wed Feb 11 10:42:27 2026 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 7CEC1C6FD1F for ; Wed, 22 Mar 2023 17:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231424AbjCVRPz (ORCPT ); Wed, 22 Mar 2023 13:15:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230483AbjCVRPt (ORCPT ); Wed, 22 Mar 2023 13:15:49 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F282265C6F for ; Wed, 22 Mar 2023 10:15:21 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id ew6so12882536edb.7 for ; Wed, 22 Mar 2023 10:15:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679505320; x=1682097320; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=vKKb1zFXQ8RMG4G+1nCtOfg0xwq/cDe7kuYBhG6cOwc=; b=f5pVr567swxunmcxX9IPCt7OG7W4StH1FMpqV8PBgfSgzwBaEtT2VquH0QH3b2rc2G HcU4g4hZtGDdwo7OSvy7CU9dW6atp4QoAXDiskYKvJPoyvO3MQXZDBrKD1V2ed53eTun OPiemkvFstE4aDHf6Hiagtj6yiM284VsRNgrUXU2qKzkybGq2jPZKJ530nVUMIXl/JMr kEWaPNOjfnO3BbZBWxN6NcNAWgsEd6eTY+PIcmloN9gEk/o7B9TZw05yh+EiT86rA7qT GDGK10HIvn5OJqcfJrACrCfbQ6teflsJnNyZaGsA1KtvLxL8+og5VXhHHKjVwxMO7asw n+rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679505320; x=1682097320; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vKKb1zFXQ8RMG4G+1nCtOfg0xwq/cDe7kuYBhG6cOwc=; b=mjhWpHWrqfc3p2TxZCBf+bXjq3HAt3Md+F4ecXduyvpf8q9Ll9KjirL0p2xDzj9wbh XUPESg9VRs5RiBU+wX8GO4ZK9IgAOx3/GmxFZfK0gpTu8xtjQS5rwRUADHB3lf5AbrJ6 3nH/uA1jTIYkk9ijDOZXpb7pF4ie1t2H4ZwWgUcy1Q+4zhEqMtS4S1GHg+hvE8bpIaoA ZmZQ/UnqZKQOdjgKkqUSYwDUNZwdGZHMK7Dfv2+BpcOHvc15zmcWKza27LFoX1r6LqU0 9Y3TrafKywxrJWaxNejoIMAvqO+wUObvPqx0hL+QUpUG+tqsdwvkWZ85AA/br9Bgaazy s+5Q== X-Gm-Message-State: AO0yUKWZ9GKrwlqEkEpyHGxq9Szi6iV5PF2uu0+8eQhn+++qhZ/lnHyZ ei8I+UkQNlPrqy/VjNZgnSA= X-Google-Smtp-Source: AK7set9QBuuXm2kHrKsCunaaLNx5vQzG5HCk3cBA72ihKO/OHTD4Cz40inrD/Qs41jPWo6rr9ZG7wQ== X-Received: by 2002:a17:906:74ca:b0:933:2e79:4632 with SMTP id z10-20020a17090674ca00b009332e794632mr5874525ejl.1.1679505320524; Wed, 22 Mar 2023 10:15:20 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id zc14-20020a170906988e00b00927f6c799e6sm7544458ejb.132.2023.03.22.10.15.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 10:15:20 -0700 (PDT) Date: Wed, 22 Mar 2023 18:15:18 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/8] staging: rtl8192e: Replace macro container_of_work_rsl with standard macro Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace macro container_of_work_rsl with standard macro container_of to increase readability. Signed-off-by: Philipp Hortmann --- V1->V2: Changed subject line to be without =E2=80=9Cf.=E2=80=9D Changed description from function to macro --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 9 +++------ drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 3 +-- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index ea07b350b62a..3244aef12c05 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -311,8 +311,7 @@ static const struct rtllib_qos_parameters def_qos_param= eters =3D { =20 static void _rtl92e_update_beacon(void *data) { - struct r8192_priv *priv =3D container_of_work_rsl(data, struct r8192_priv, - update_beacon_wq.work); + struct r8192_priv *priv =3D container_of(data, struct r8192_priv, update_= beacon_wq.work); struct net_device *dev =3D priv->rtllib->dev; struct rtllib_device *ieee =3D priv->rtllib; struct rtllib_network *net =3D &ieee->current_network; @@ -326,8 +325,7 @@ static void _rtl92e_update_beacon(void *data) =20 static void _rtl92e_qos_activate(void *data) { - struct r8192_priv *priv =3D container_of_work_rsl(data, struct r8192_priv, - qos_activate); + struct r8192_priv *priv =3D container_of(data, struct r8192_priv, qos_act= ivate); struct net_device *dev =3D priv->rtllib->dev; int i; =20 @@ -2033,8 +2031,7 @@ void rtl92e_commit(struct net_device *dev) =20 static void _rtl92e_restart(void *data) { - struct r8192_priv *priv =3D container_of_work_rsl(data, struct r8192_priv, - reset_wq); + struct r8192_priv *priv =3D container_of(data, struct r8192_priv, reset_w= q); struct net_device *dev =3D priv->rtllib->dev; =20 mutex_lock(&priv->wx_mutex); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index ef4f736ce325..5a1cd22f5e25 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -142,8 +142,7 @@ void rtl92e_ips_leave(struct net_device *dev) =20 void rtl92e_ips_leave_wq(void *data) { - struct rtllib_device *ieee =3D container_of_work_rsl(data, - struct rtllib_device, ips_leave_wq); + struct rtllib_device *ieee =3D container_of(data, struct rtllib_device, i= ps_leave_wq); struct net_device *dev =3D ieee->dev; struct r8192_priv *priv =3D (struct r8192_priv *)rtllib_priv(dev); =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index aa39f8b2bf09..669a9d9a5d18 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -62,7 +62,6 @@ #define IW_CUSTOM_MAX 256 /* In bytes */ #endif =20 -#define container_of_work_rsl(x, y, z) container_of(x, y, z) #define container_of_dwork_rsl(x, y, z) \ container_of(to_delayed_work(x), y, z) =20 diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 91fb5f150a00..b9886e83a6dc 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1498,7 +1498,7 @@ static void rtllib_associate_step2(struct rtllib_devi= ce *ieee) static void rtllib_associate_complete_wq(void *data) { struct rtllib_device *ieee =3D (struct rtllib_device *) - container_of_work_rsl(data, + container_of(data, struct rtllib_device, associate_complete_wq); struct rt_pwr_save_ctrl *psc =3D &ieee->pwr_save_ctrl; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 06f1d6de5cc7..1f2fa711e60b 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -326,8 +326,7 @@ EXPORT_SYMBOL(rtllib_wx_set_mode); =20 void rtllib_wx_sync_scan_wq(void *data) { - struct rtllib_device *ieee =3D container_of_work_rsl(data, - struct rtllib_device, wx_sync_scan_wq); + struct rtllib_device *ieee =3D container_of(data, struct rtllib_device, w= x_sync_scan_wq); short chan; enum ht_extchnl_offset chan_offset =3D 0; enum ht_channel_width bandwidth =3D 0; --=20 2.39.2