From nobody Wed Feb 11 07:48:29 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 1B027C6FD1C for ; Wed, 22 Mar 2023 17:15:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231311AbjCVRO6 (ORCPT ); Wed, 22 Mar 2023 13:14:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231420AbjCVROx (ORCPT ); Wed, 22 Mar 2023 13:14:53 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E39F63BDA2 for ; Wed, 22 Mar 2023 10:14:51 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id b20so42918628edd.1 for ; Wed, 22 Mar 2023 10:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679505290; x=1682097290; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=u5yXLlkqZjanh8KqT4LvmjNz0D0TSKdSJZ7tz2Svtzk=; b=oJLTd8fI9szo/ArYmHGfkghADYvD50mkT97sMs/nDa3rKdFQ3Ymptg4shDMr3Evrip c/2gaRQ52RplMdiKqBKVroalHbiVat1eP8k7Fjor3RPgL9Fw5q4LkT1MSzhMDpG2ylQb HLxLTbAAQ0F46R844UDpap7Qvz5UfRWJtltnxO4lQ39Bybu+e+H5zIhrUa68+sKJPSgQ eSNIR8c00mBrvR5sVWjl+xTW43Tt4j3K3dfPNj8r/1jOF7zuDr1PMM9BGfpxhSJoFLGX 9u5S+a2VK+d+QknW/G3a24BQfhahv8jfvnTDZQtRGzEK1+SvKaYjnQFqC7+NSp2Wxm30 xCLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679505290; x=1682097290; h=in-reply-to: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=u5yXLlkqZjanh8KqT4LvmjNz0D0TSKdSJZ7tz2Svtzk=; b=L3kxEauiE2gv35oRxmLqNiVnmuAUDIoiSGeSL4zoS4SIINTgJhSUTXANex0rpQQXPX LgN0CkUcNP9sjivHdCsMyIZkmq4taIyFoyxi/nOO9SKip580iBPMoYcBQjsk/y/7vxLg eOn/JMMzrW0R6lwLaMRGbsIO6Yx0MDSV1kZbclEt9UKWMUavuEHdvqIAgo5EGbNx5fbM ZBQdHzcjzQ+xwUMQjZtDSl+V07ECtAA9gVYlnP8644R1aRioPrWMeIE54zGLJAQgbfxj 2iV836JhFqPgKTUvShsYwLsqzWWn3sGgg2hgpsLCm5eK8hxLrL9Tn9PhHTpdVPd8vg7G Da6w== X-Gm-Message-State: AO0yUKXkEeAGwBuq1OuEwKz/NBkzSdLCbJZO1+Y2+pwLl8TF4jTm7YK/ 16CABM7KCrNZgiGE8+ZObrk= X-Google-Smtp-Source: AK7set/6G4WQ2yF5e0YfTFolmbs6T+2hHmWTQFupI20p/baBDuQ7Q2eOLOQoxQeg4OEhRFe3RhRS4w== X-Received: by 2002:a05:6402:2803:b0:4fa:6137:cbf2 with SMTP id h3-20020a056402280300b004fa6137cbf2mr8442724ede.1.1679505290403; Wed, 22 Mar 2023 10:14:50 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id x21-20020a50d615000000b004bb810e0b87sm8096916edi.39.2023.03.22.10.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 10:14:49 -0700 (PDT) Date: Wed, 22 Mar 2023 18:14:48 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/8] staging: rtl8192e: Remove double defined constants bMaskBytex and more Message-ID: <3f31664d8751ebb8b78cbd7d019f002fb2ba4c3c.1679504314.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove double defined constants. Signed-off-by: Philipp Hortmann --- V1->V2: Changed subject line to be without .. --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index fd34756e450f..498da6be3e4e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -25,14 +25,6 @@ enum rf90_radio_path { RF90_PATH_MAX }; =20 -#define bMaskByte0 0xff -#define bMaskByte1 0xff00 -#define bMaskByte2 0xff0000 -#define bMaskByte3 0xff000000 -#define bMaskHWord 0xffff0000 -#define bMaskLWord 0x0000ffff -#define bMaskDWord 0xffffffff - void rtl92e_set_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask, u32 dwData); u32 rtl92e_get_bb_reg(struct net_device *dev, u32 dwRegAddr, u32 dwBitMask= ); --=20 2.39.2 From nobody Wed Feb 11 07:48:29 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 029F8C6FD1F for ; Wed, 22 Mar 2023 17:15:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231366AbjCVRPC (ORCPT ); Wed, 22 Mar 2023 13:15:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230322AbjCVRO6 (ORCPT ); Wed, 22 Mar 2023 13:14:58 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 944C164866 for ; Wed, 22 Mar 2023 10:14:57 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id cn12so30218190edb.4 for ; Wed, 22 Mar 2023 10:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679505296; 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=YwlxfJdJWd/C2Uy2mVEIXe3Fs4cv7HuOigtW0ECLJNU=; b=i/1NL3llpeN22VO2qWLkFXGR6pObJ6tWsek5bEwsmDVHmQLn5Bl2gl3f5JOxYQpx9L PzMLlJs45OcXRoVi0YrU9Q7rUAGSrw+XzQS9FeF4ivB4UgR0UheN/NJOeroUlmhrEGs6 UTa1TjlPO1vv0eQTdCNgVgyjACRMD1FUmlixrfk2ejtsYiFG35/eqmz1iR5C/eee8ZVe FmrhxRhSNMfWNRUzoDtyJofLnSRSb0e9c5iQ56OtYXDonfMm3XYZ+TfJpCUh42f2DUjV DcgzVNigo5S1YI19l/y7SM8TuD5Dh0iHehCksJrLK4d7NmVZNJH0YFy87ZRTuA0nqYpS mzWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679505296; 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=YwlxfJdJWd/C2Uy2mVEIXe3Fs4cv7HuOigtW0ECLJNU=; b=uUUizCqTHcwyJEd487tRHgQgFeGYkHXAa3r072de9jld8raPc3jQ64tv6TWHeV2bWQ 1Ngk+9MEts9HHUouvh/qWPIhOonGf+iEOn1cG/BHzPSnpyrc6U9yC4FY+3LnlMHICHTU Os1z8Hty1luYnE7NdDgpmwRcZwQvwer6BKBzxDo1gUuMfa2syZO78NA3F+2DHPZXIvk5 ALeRCXIjbuAciK8PQjoSFxaSVfSiqWS1gaqvTAn7IMnTa1bQ7lnEAtEJOXz9ovsLnB2o avjfXt06kFqzNRIiN/nSS1yCe9LMdsCXJeyiQjs+bsyU3NCOS5WQ3jHF69pkRsY+2Wa5 mPSQ== X-Gm-Message-State: AO0yUKXrTQYjVI3v9xDWzguiTEhyuHlhcUzp3Xr5xdo1jLbczbtFRtDK leKcJD2nhHjqHgvP3zCdTG0= X-Google-Smtp-Source: AK7set9/cS06/DZEfO6BPPK1A8WvSG8vShlu49d5pGRPlgSTiBTdrQ73fnb+l0dMwb3YbMfoIHAUDA== X-Received: by 2002:a17:906:7485:b0:8b1:2614:dea6 with SMTP id e5-20020a170906748500b008b12614dea6mr7099804ejl.1.1679505296127; Wed, 22 Mar 2023 10:14:56 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id z3-20020a170906434300b008d427df3245sm7513015ejm.58.2023.03.22.10.14.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 10:14:55 -0700 (PDT) Date: Wed, 22 Mar 2023 18:14:53 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/8] staging: rtl8192e: Replace macro skb_tail_pointer_rsl with standard function Message-ID: <6885112850b48c0f9ff16655f7d9efe085ccc001.1679504314.git.philipp.g.hortmann@gmail.com> 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 skb_tail_pointer_rsl with function skb_tail_pointer to increase readablility. Signed-off-by: Philipp Hortmann --- V1->V2: Changed subject line to be without =E2=80=9Cf.=E2=80=9D --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 47feb4248d25..2ec47c367c5f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1653,7 +1653,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device = *dev) priv->rx_buf[rx_queue_idx][i] =3D skb; mapping =3D (dma_addr_t *)skb->cb; *mapping =3D dma_map_single(&priv->pdev->dev, - skb_tail_pointer_rsl(skb), + skb_tail_pointer(skb), priv->rxbuffersize, DMA_FROM_DEVICE); if (dma_mapping_error(&priv->pdev->dev, *mapping)) { dev_kfree_skb_any(skb); @@ -1909,7 +1909,7 @@ static void _rtl92e_rx_normal(struct net_device *dev) priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]] =3D skb; *((dma_addr_t *)skb->cb) =3D dma_map_single(&priv->pdev->dev, - skb_tail_pointer_rsl(skb), + skb_tail_pointer(skb), priv->rxbuffersize, DMA_FROM_DEVICE); if (dma_mapping_error(&priv->pdev->dev, *((dma_addr_t *)skb->cb))) { dev_kfree_skb_any(skb); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 8e5e29ce8f0d..cb904fc4f574 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -62,8 +62,6 @@ #define IW_CUSTOM_MAX 256 /* In bytes */ #endif =20 -#define skb_tail_pointer_rsl(skb) skb_tail_pointer(skb) - #define queue_delayed_work_rsl(x, y, z) queue_delayed_work(x, y, z) #define INIT_DELAYED_WORK_RSL(x, y, z) INIT_DELAYED_WORK(x, y) =20 --=20 2.39.2 From nobody Wed Feb 11 07:48:29 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 03FF9C6FD1C for ; Wed, 22 Mar 2023 17:15:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231382AbjCVRPN (ORCPT ); Wed, 22 Mar 2023 13:15:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231403AbjCVRPI (ORCPT ); Wed, 22 Mar 2023 13:15:08 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9ED9B65469 for ; Wed, 22 Mar 2023 10:15:04 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id eh3so75841545edb.11 for ; Wed, 22 Mar 2023 10:15:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679505303; x=1682097303; 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=TXfJ+2b55JPGSMz5Q3HBnYgsDGuPhWyRh26ofAF5NYc=; b=TqoEOhVG/jqyArt9PpQt5UJgpgtofFHKrtBvtcXu/guu+XTExQebbY3kIoeqza0pcc eIzK/l88oHE2OTA0Bn1zUDtFtUZ9uf8REaBko3OWuV8ARFteJlIW/vBQU2PuphFvKxOO kqCJ4QmI8khz2Th92+/bHl+T8HfU4QEkPo/aT6oZFaJelwCStgaw5lcd5//x2pp74UPm zySxJMwI3afiGtMdfhEQMwwtD42WxUMKDEuSJ0BgvQDCGafaYLZZITBtTj97xZyvvwOC BxDFCrlHdkjKCdIZ1m5zZmCtBQmkHP1g1ejegCYtREP1/JfzOVt+2DB5kqTfvnlXsv9j IQbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679505303; x=1682097303; 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=TXfJ+2b55JPGSMz5Q3HBnYgsDGuPhWyRh26ofAF5NYc=; b=6LZwsOkL25RzbTHVcihyjVwLuRIj/z5I13XBrGUFXwdSDXSfp5xxdMWMqIFU/OxEvS EzxBS7YOuT2a/r3Ia2SJnvCaH1nfZwEy2WANbpC9xUYgZHk2+1DW1vJ4RL8ZAq0SC0b6 AsH2asOwmVqETWNdv62O+DZOWsW4/82KvY09h2Exw5x00xlFGLEv12aAGRSK7H4+ZHfa 2cU4vYHGKZTk1i7AsYujoAxRXIQYYAy6pK3V+qes7JFDvF4j87KCT6kDTqV7vqpZloMT hM1anN2N6JpBnYVq/cwwlKJVqa50guvEifEUzbjEWlUPOu+DsJJhhKjJ3Oruepo0eroH Ytow== X-Gm-Message-State: AO0yUKWNxCDUlDYW1X18tdWAu/6aFwCni2aFc2ubd+xOL0wd4g2kyl20 Qsor7KB3LsRPFu3GFvCqjJ5VXbAIDvs= X-Google-Smtp-Source: AK7set+O97i1N28jdHjPDOelpFeYC4L6ZjRG3cBvgKFZHHZA1m3wOHPIpafA3QfcepZQB6Yqd48xwA== X-Received: by 2002:a17:906:105c:b0:92f:ceed:ab35 with SMTP id j28-20020a170906105c00b0092fceedab35mr6321485ejj.5.1679505302611; Wed, 22 Mar 2023 10:15:02 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id c2-20020a170906694200b0092b546b57casm7471706ejs.195.2023.03.22.10.15.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 10:15:02 -0700 (PDT) Date: Wed, 22 Mar 2023 18:15:00 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/8] staging: rtl8192e: Remove unused macro queue_delayed_work_rsl and more Message-ID: <3ed738a5d67a999ad42454fcb0d6668bfa706205.1679504314.git.philipp.g.hortmann@gmail.com> 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 Remove unused macro queue_delayed_work_rsl and queue_work_rsl to increase readability. Signed-off-by: Philipp Hortmann --- V1->V2: Changed subject line to be without =E2=80=9C..=E2=80=9D --- drivers/staging/rtl8192e/rtllib.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index cb904fc4f574..8965bb605eaa 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -62,10 +62,8 @@ #define IW_CUSTOM_MAX 256 /* In bytes */ #endif =20 -#define queue_delayed_work_rsl(x, y, z) queue_delayed_work(x, y, z) #define INIT_DELAYED_WORK_RSL(x, y, z) INIT_DELAYED_WORK(x, y) =20 -#define queue_work_rsl(x, y) queue_work(x, y) #define INIT_WORK_RSL(x, y, z) INIT_WORK(x, y) =20 #define container_of_work_rsl(x, y, z) container_of(x, y, z) --=20 2.39.2 From nobody Wed Feb 11 07:48:29 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 895E2C6FD1C for ; Wed, 22 Mar 2023 17:15:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230322AbjCVRPa (ORCPT ); Wed, 22 Mar 2023 13:15:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231420AbjCVRPV (ORCPT ); Wed, 22 Mar 2023 13:15:21 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E8714E5CD for ; Wed, 22 Mar 2023 10:15:10 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id ew6so12880256edb.7 for ; Wed, 22 Mar 2023 10:15:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679505308; x=1682097308; 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=3bbKg7FyJDOKWJFl4zE5/yQHEnuXb4tsxfmTupEGD00=; b=mxoP0PQgIVbOZ6pf1eX+ncgqg/XlaOYFD5zbOffXX3DtD2YQWeBTszZGC6L8EuEJwd sVvrQHiAliZMhEd9UjCijKzgtxFYbKDJepWfOmUeOZmuEunxLG/OHSnm6xksRom66uft R5pHDhkdofj3ZD76BzaGvip8XCYjGHUE0tUn8I53jWzOwiuaG2PEGFckd1a/NyJF1FZj /iRElxQb6+BmCD4l5RVOdZWfPGgF2OEmFxtkAbSUKduYAgWxFfatlTV7YwBrH6+Hp945 RSpARWuZFmwxs6pt5yJ5YET4u0nxV7TCr61tFfchhcNfzfYBs09pTq7sHUczj06rY8sx WYvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679505308; x=1682097308; 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=3bbKg7FyJDOKWJFl4zE5/yQHEnuXb4tsxfmTupEGD00=; b=VyrP/Zf5MRgJgW7k3xvxPpmo7QRXobRcI+YK8Sq9zMSqWUKbwp2eY4GnoAyHx3f3Hk FbRyxLZWumzl4BEuzPnLodyCKbkmWoJJcLkJRkKsMQ6kQPiR08twB5XIeM3Q57VL4nKO 7+nQv2z90x6fXfdJl+oTAPLrCBLQqPR4O9Ii+UushlvhsqFnZ3eJaGjHh1gNx3ofhKys ADZKeDKygL5Lg4e9ZmBsbEZZ39KZYd5Ddy+0EnDUjs/z75rB/uSC36N5tlqHRC880L/7 cfUyxDAVxlQ7mxMSzljNGjFaN9kFkorCJfaHjuE7spDzFKxyItMXZxiQza2kk8Bp2xLO Vi7A== X-Gm-Message-State: AO0yUKWsOZxvdcsIoAor5i75FNs4TiaMLjSh/2oUsB4fDr7ylyW4JbGJ Y7sDZKHh8+UXN6H0nKC3Ffo= X-Google-Smtp-Source: AK7set/n+1PLAyZk8FRUplGPssF058bNcofPPkfZ13wToXopvt3mScjLKb8nKzrA/fjJwIShkb8QAg== X-Received: by 2002:a17:906:10d0:b0:931:4285:ea16 with SMTP id v16-20020a17090610d000b009314285ea16mr7048731ejv.7.1679505308378; Wed, 22 Mar 2023 10:15:08 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id a20-20020a17090680d400b008def483cf79sm7395702ejx.168.2023.03.22.10.15.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 10:15:07 -0700 (PDT) Date: Wed, 22 Mar 2023 18:15:06 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/8] staging: rtl8192e: Replace macro INIT_DELAYED_WORK_RSL with standard macro Message-ID: <61b589012a5efb4b68a76e52eb84ad19093013b3.1679504314.git.philipp.g.hortmann@gmail.com> 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 INIT_DELAYED_WORK_RSL with standard macro INIT_DELAYED_WORK to increase readability. Signed-off-by: Philipp Hortmann --- V1->V2: Changed subject line to be without =E2=80=9Cm.=E2=80=9D --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 18 ++++++------------ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 3 +-- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac.c | 15 +++++---------- 4 files changed, 12 insertions(+), 26 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 2ec47c367c5f..a2263c41c6c8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -893,19 +893,13 @@ static void _rtl92e_init_priv_task(struct net_device = *dev) INIT_WORK_RSL(&priv->reset_wq, (void *)_rtl92e_restart, dev); INIT_WORK_RSL(&priv->rtllib->ips_leave_wq, (void *)rtl92e_ips_leave_wq, dev); - INIT_DELAYED_WORK_RSL(&priv->watch_dog_wq, - (void *)_rtl92e_watchdog_wq_cb, dev); - INIT_DELAYED_WORK_RSL(&priv->txpower_tracking_wq, - (void *)rtl92e_dm_txpower_tracking_wq, dev); - INIT_DELAYED_WORK_RSL(&priv->rfpath_check_wq, - (void *)rtl92e_dm_rf_pathcheck_wq, dev); - INIT_DELAYED_WORK_RSL(&priv->update_beacon_wq, - (void *)_rtl92e_update_beacon, dev); + INIT_DELAYED_WORK(&priv->watch_dog_wq, (void *)_rtl92e_watchdog_wq_cb); + INIT_DELAYED_WORK(&priv->txpower_tracking_wq, (void *)rtl92e_dm_txpower_t= racking_wq); + INIT_DELAYED_WORK(&priv->rfpath_check_wq, (void *)rtl92e_dm_rf_pathcheck_= wq); + INIT_DELAYED_WORK(&priv->update_beacon_wq, (void *)_rtl92e_update_beacon); INIT_WORK_RSL(&priv->qos_activate, (void *)_rtl92e_qos_activate, dev); - INIT_DELAYED_WORK_RSL(&priv->rtllib->hw_wakeup_wq, - (void *)rtl92e_hw_wakeup_wq, dev); - INIT_DELAYED_WORK_RSL(&priv->rtllib->hw_sleep_wq, - (void *)rtl92e_hw_sleep_wq, dev); + INIT_DELAYED_WORK(&priv->rtllib->hw_wakeup_wq, (void *)rtl92e_hw_wakeup_w= q); + INIT_DELAYED_WORK(&priv->rtllib->hw_sleep_wq, (void *)rtl92e_hw_sleep_wq); tasklet_setup(&priv->irq_rx_tasklet, _rtl92e_irq_rx_tasklet); tasklet_setup(&priv->irq_tx_tasklet, _rtl92e_irq_tx_tasklet); tasklet_setup(&priv->irq_prepare_beacon_tasklet, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index eb54f8cbee76..b745b73eedea 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -217,8 +217,7 @@ void rtl92e_dm_init(struct net_device *dev) if (IS_HARDWARE_TYPE_8192SE(dev)) _rtl92e_dm_init_wa_broadcom_iot(dev); =20 - INIT_DELAYED_WORK_RSL(&priv->gpio_change_rf_wq, - (void *)_rtl92e_dm_check_rf_ctrl_gpio, dev); + INIT_DELAYED_WORK(&priv->gpio_change_rf_wq, (void *)_rtl92e_dm_check_rf_c= trl_gpio); } =20 void rtl92e_dm_deinit(struct net_device *dev) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 8965bb605eaa..8cbefa6dfd6e 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -62,8 +62,6 @@ #define IW_CUSTOM_MAX 256 /* In bytes */ #endif =20 -#define INIT_DELAYED_WORK_RSL(x, y, z) INIT_DELAYED_WORK(x, y) - #define INIT_WORK_RSL(x, y, z) INIT_WORK(x, y) =20 #define container_of_work_rsl(x, y, z) container_of(x, y, z) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 4923423aa85b..c442fc98283d 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2996,18 +2996,13 @@ int rtllib_softmac_init(struct rtllib_device *ieee) =20 timer_setup(&ieee->beacon_timer, rtllib_send_beacon_cb, 0); =20 - INIT_DELAYED_WORK_RSL(&ieee->link_change_wq, - (void *)rtllib_link_change_wq, ieee); - INIT_DELAYED_WORK_RSL(&ieee->start_ibss_wq, - (void *)rtllib_start_ibss_wq, ieee); + INIT_DELAYED_WORK(&ieee->link_change_wq, (void *)rtllib_link_change_wq); + INIT_DELAYED_WORK(&ieee->start_ibss_wq, (void *)rtllib_start_ibss_wq); INIT_WORK_RSL(&ieee->associate_complete_wq, (void *)rtllib_associate_complete_wq, ieee); - INIT_DELAYED_WORK_RSL(&ieee->associate_procedure_wq, - (void *)rtllib_associate_procedure_wq, ieee); - INIT_DELAYED_WORK_RSL(&ieee->softmac_scan_wq, - (void *)rtllib_softmac_scan_wq, ieee); - INIT_DELAYED_WORK_RSL(&ieee->associate_retry_wq, - (void *)rtllib_associate_retry_wq, ieee); + INIT_DELAYED_WORK(&ieee->associate_procedure_wq, (void *)rtllib_associate= _procedure_wq); + INIT_DELAYED_WORK(&ieee->softmac_scan_wq, (void *)rtllib_softmac_scan_wq); + INIT_DELAYED_WORK(&ieee->associate_retry_wq, (void *)rtllib_associate_ret= ry_wq); INIT_WORK_RSL(&ieee->wx_sync_scan_wq, (void *)rtllib_wx_sync_scan_wq, ieee); =20 --=20 2.39.2 From nobody Wed Feb 11 07:48:29 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 A8D9EC6FD1C for ; Wed, 22 Mar 2023 17:15:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231403AbjCVRPo (ORCPT ); Wed, 22 Mar 2023 13:15:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230505AbjCVRPi (ORCPT ); Wed, 22 Mar 2023 13:15:38 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BBDE64AB8 for ; Wed, 22 Mar 2023 10:15:16 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id y4so75948278edo.2 for ; Wed, 22 Mar 2023 10:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679505315; x=1682097315; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=JECvJ/K7E4yzQQFzJdiJ4lI6M7UJm3etUVtp/7RJfO0=; b=RaG65SripXOXd4P3RbaRyrmMRcCS9zYqhLN6j/FlAQWC1wRroz9Ff/XrT553zzAXlD 7LA6vkW0tDf7AQCHomMUHYm4LS6Do6sLr+AI/00gYo1mxPFFdyFVMgpG/InrtmjAVrlI r70mGV+LG3qkAcPAzEuE4AuEYOrKOKLXXvoBW5+YgkbY8/6Nhj8yOpK274zlL03E9HKe FSt+0xQDGlhF4YUmR0MFm7vgy/OUGs9QJ6VQsJjjPgUC1ydjxfj2CHhTJ+yJIrkOSg4P XqkA/j7jPZxlnlDUlbMrjz3yVJ7NIRmJKVN/qVHZHYbc5Cvr14wO5t4gVtVc9lMR5TtQ +Dkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679505315; x=1682097315; h=in-reply-to: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=JECvJ/K7E4yzQQFzJdiJ4lI6M7UJm3etUVtp/7RJfO0=; b=H6A19GcCqfWE2+lvrpZzScQzP7vdd2NoYQ5nJPrHFnza59MdqfoSwKRGBuIhjL/rIl C/K6GSKZS3j/yO3vKnH8qUXNfkoWKrgjPa8ZMG8sC13Yjo3HvsRgCMj/F085bovHhFTH cws460Ek6CmX2BYHbDvHljaAQh4CIl1TSiDcp4TxeiDvIAYX7/OPKaZenTkQEkjwyc4S 9G15jmjHXD1tdLC1OZ6lEVuUPG67xO+OKd9+uiV1NnicqOVpI7zeqjnborlKh4ag8ioc Jxry2tH/NmtsYRsQUhWwdqYpKZU7Q1lobFE8wbI0n0bnCrfdlGXZiovMQxmhW5ZFxsPa 0wmQ== X-Gm-Message-State: AO0yUKW1X+FvnchapczJ4KZ64CK7I2gVplKAWx8em0ro9Gs6yfJg/Ppn 79/8hIoi0F08OkyDc/7l2xTwCN94jVk= X-Google-Smtp-Source: AK7set8ffGT/kzRNoSw203vZvPePb4caVvJ5GhXeIIkpX3RqcxMuKVYvyHUI+Lr8bYt8bpsU8IKhgA== X-Received: by 2002:a17:906:100a:b0:933:fa42:7e36 with SMTP id 10-20020a170906100a00b00933fa427e36mr6543719ejm.5.1679505314948; Wed, 22 Mar 2023 10:15:14 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id y70-20020a50bb4c000000b004fa380a14e7sm8109199ede.77.2023.03.22.10.15.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 10:15:14 -0700 (PDT) Date: Wed, 22 Mar 2023 18:15:12 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/8] staging: rtl8192e: Replace macro INIT_WORK_RSL with standard macro Message-ID: <71879ccda54d57078f47c70cdba90ae2234adc91.1679504314.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace macro INIT_WORK_RSL with standard macro INIT_WORK to increase readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 +++---- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index a2263c41c6c8..ea07b350b62a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -890,14 +890,13 @@ static void _rtl92e_init_priv_task(struct net_device = *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 - INIT_WORK_RSL(&priv->reset_wq, (void *)_rtl92e_restart, dev); - INIT_WORK_RSL(&priv->rtllib->ips_leave_wq, (void *)rtl92e_ips_leave_wq, - dev); + INIT_WORK(&priv->reset_wq, (void *)_rtl92e_restart); + INIT_WORK(&priv->rtllib->ips_leave_wq, (void *)rtl92e_ips_leave_wq); INIT_DELAYED_WORK(&priv->watch_dog_wq, (void *)_rtl92e_watchdog_wq_cb); INIT_DELAYED_WORK(&priv->txpower_tracking_wq, (void *)rtl92e_dm_txpower_t= racking_wq); INIT_DELAYED_WORK(&priv->rfpath_check_wq, (void *)rtl92e_dm_rf_pathcheck_= wq); INIT_DELAYED_WORK(&priv->update_beacon_wq, (void *)_rtl92e_update_beacon); - INIT_WORK_RSL(&priv->qos_activate, (void *)_rtl92e_qos_activate, dev); + INIT_WORK(&priv->qos_activate, (void *)_rtl92e_qos_activate); INIT_DELAYED_WORK(&priv->rtllib->hw_wakeup_wq, (void *)rtl92e_hw_wakeup_w= q); INIT_DELAYED_WORK(&priv->rtllib->hw_sleep_wq, (void *)rtl92e_hw_sleep_wq); tasklet_setup(&priv->irq_rx_tasklet, _rtl92e_irq_rx_tasklet); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 8cbefa6dfd6e..aa39f8b2bf09 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -62,8 +62,6 @@ #define IW_CUSTOM_MAX 256 /* In bytes */ #endif =20 -#define INIT_WORK_RSL(x, y, z) INIT_WORK(x, y) - #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) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index c442fc98283d..91fb5f150a00 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2998,13 +2998,11 @@ int rtllib_softmac_init(struct rtllib_device *ieee) =20 INIT_DELAYED_WORK(&ieee->link_change_wq, (void *)rtllib_link_change_wq); INIT_DELAYED_WORK(&ieee->start_ibss_wq, (void *)rtllib_start_ibss_wq); - INIT_WORK_RSL(&ieee->associate_complete_wq, - (void *)rtllib_associate_complete_wq, ieee); + INIT_WORK(&ieee->associate_complete_wq, (void *)rtllib_associate_complete= _wq); INIT_DELAYED_WORK(&ieee->associate_procedure_wq, (void *)rtllib_associate= _procedure_wq); INIT_DELAYED_WORK(&ieee->softmac_scan_wq, (void *)rtllib_softmac_scan_wq); INIT_DELAYED_WORK(&ieee->associate_retry_wq, (void *)rtllib_associate_ret= ry_wq); - INIT_WORK_RSL(&ieee->wx_sync_scan_wq, (void *)rtllib_wx_sync_scan_wq, - ieee); + INIT_WORK(&ieee->wx_sync_scan_wq, (void *)rtllib_wx_sync_scan_wq); =20 mutex_init(&ieee->wx_mutex); mutex_init(&ieee->scan_mutex); --=20 2.39.2 From nobody Wed Feb 11 07:48:29 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 From nobody Wed Feb 11 07:48:29 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 B609BC6FD1F for ; Wed, 22 Mar 2023 17:16:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231546AbjCVRQT (ORCPT ); Wed, 22 Mar 2023 13:16:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231453AbjCVRQC (ORCPT ); Wed, 22 Mar 2023 13:16:02 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69F95637C4 for ; Wed, 22 Mar 2023 10:15:28 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id h8so75846288ede.8 for ; Wed, 22 Mar 2023 10:15:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679505327; x=1682097327; 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=lUXfjO9MLExMn6IoI9J9KH+mTRK8zfSKTM2CAEavc0Q=; b=StizjcQ7WHtK5C9WkTHZfZVzbgeCBIoZs/U03xKRNTW3g6z5Su1ebLLig/QHnem0Rt lnrt/iGBcYCm9ODYVfIuZz3hkaqMYy+zkrt8/TNCGRugZBy7iV2UgX/GfPSPU4FjBc2E 8WuWBprxLSns8Wh6t0G8KUR/OhQn/tX/VKpRs5qGPjPFGcyBIGnGIEA1VEfC8I0Arfcm +DuvzDVrCXa/7bhER7Iy0tAavUW+rERFgg9tiMbQuK4cPMi6+9Hc2Pj3CfA+kAkp0iOi pJwlDQkrIAk4fnY/pJHgPhn7KHkfyhlacr3TOEzKGQPEvIEF5U2dVugi9svrI2epibak D9ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679505327; x=1682097327; 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=lUXfjO9MLExMn6IoI9J9KH+mTRK8zfSKTM2CAEavc0Q=; b=SK0m9b8NVt1C8xK54Smr33wmq7EG69fk5wX+wEo/QdT0EV37ZJidn6/+RDt+jj4wXw mWh3P5k8JwR+FJrrHx3f4i9N8ltoInQUwLrMG2TC+kiHXYeIcyxwgtRNhxNev8WElaQG d7cy/OBXlPAjLAkwlYbwxufDOKdh5cbW78RFyONRgvy0t1k8oNb+VuNIC7Px1+qMjVQl k1l0QTH0biTEYplVeapVorCX6CqwHEixDx6+Rs8GSUj+HhRNFNNA5ShmdW4TqykcQxb/ lGIKHj7djBKZbFBZ0iXP5UGnLTRhDiQBSkMMycG1bZT4ru3BpMc9dXd90wVEV1LNJlEb 9+Sg== X-Gm-Message-State: AO0yUKUcf7Y3BvrcnAZsaaYONQZpv9aVkuqGrHqCC1E2j7LNQKpomZyF XFPlAG4/9gPXjJtcGjfBZAw= X-Google-Smtp-Source: AK7set+3A/hNGGINr2P2D/xVNkf3ePrjH6RFD2x2Wdd7V4LJUOVPf8zZcERsfcF423/cyk/JA4Nu/Q== X-Received: by 2002:a17:906:224f:b0:92e:f520:7762 with SMTP id 15-20020a170906224f00b0092ef5207762mr6720088ejr.6.1679505326925; Wed, 22 Mar 2023 10:15:26 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id lc5-20020a170906dfe500b0092973e209f2sm7451911ejc.109.2023.03.22.10.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 10:15:26 -0700 (PDT) Date: Wed, 22 Mar 2023 18:15:24 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/8] staging: rtl8192e: Replace macro iwe_stream_add_event_rsl with standard function Message-ID: <00a8057acc994c139530a070974694b999a8f96a.1679504314.git.philipp.g.hortmann@gmail.com> 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 iwe_stream_add_event_rsl with standard function iwe_stream_add_event to increase readability. Signed-off-by: Philipp Hortmann --- V1->V2: Changed subject line to be without =E2=80=9Cf.=E2=80=9D --- drivers/staging/rtl8192e/rtllib.h | 3 --- drivers/staging/rtl8192e/rtllib_wx.c | 16 ++++++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 669a9d9a5d18..81d630cf7e52 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -65,9 +65,6 @@ #define container_of_dwork_rsl(x, y, z) \ container_of(to_delayed_work(x), y, z) =20 -#define iwe_stream_add_event_rsl(info, start, stop, iwe, len) \ - iwe_stream_add_event(info, start, stop, iwe, len) - #define iwe_stream_add_point_rsl(info, start, stop, iwe, p) \ iwe_stream_add_point(info, start, stop, iwe, p) =20 diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192= e/rtllib_wx.c index 217426ee2e92..e580cd01c201 100644 --- a/drivers/staging/rtl8192e/rtllib_wx.c +++ b/drivers/staging/rtl8192e/rtllib_wx.c @@ -41,8 +41,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_= device *ieee, iwe.cmd =3D SIOCGIWAP; iwe.u.ap_addr.sa_family =3D ARPHRD_ETHER; ether_addr_copy(iwe.u.ap_addr.sa_data, network->bssid); - start =3D iwe_stream_add_event_rsl(info, start, stop, - &iwe, IW_EV_ADDR_LEN); + start =3D iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN); /* Remaining entries will be displayed in the order we provide them */ =20 /* Add the ESSID */ @@ -71,8 +70,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_= device *ieee, } *pname =3D '\0'; snprintf(iwe.u.name, IFNAMSIZ, "IEEE802.11%s", proto_name); - start =3D iwe_stream_add_event_rsl(info, start, stop, - &iwe, IW_EV_CHAR_LEN); + start =3D iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN); /* Add mode */ iwe.cmd =3D SIOCGIWMODE; if (network->capability & @@ -81,8 +79,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_= device *ieee, iwe.u.mode =3D IW_MODE_MASTER; else iwe.u.mode =3D IW_MODE_ADHOC; - start =3D iwe_stream_add_event_rsl(info, start, stop, - &iwe, IW_EV_UINT_LEN); + start =3D iwe_stream_add_event(info, start, stop, &iwe, IW_EV_UINT_LEN); } =20 /* Add frequency/channel */ @@ -90,8 +87,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_= device *ieee, iwe.u.freq.m =3D network->channel; iwe.u.freq.e =3D 0; iwe.u.freq.i =3D 0; - start =3D iwe_stream_add_event_rsl(info, start, stop, &iwe, - IW_EV_FREQ_LEN); + start =3D iwe_stream_add_event(info, start, stop, &iwe, IW_EV_FREQ_LEN); =20 /* Add encryption capability */ iwe.cmd =3D SIOCGIWENCODE; @@ -152,7 +148,7 @@ static inline char *rtl819x_translate_scan(struct rtlli= b_device *ieee, iwe.u.bitrate.disabled =3D 0; iwe.u.bitrate.fixed =3D 0; iwe.u.bitrate.value =3D max_rate * 500000; - start =3D iwe_stream_add_event_rsl(info, start, stop, &iwe, IW_EV_PARAM_L= EN); + start =3D iwe_stream_add_event(info, start, stop, &iwe, IW_EV_PARAM_LEN); iwe.cmd =3D IWEVCUSTOM; iwe.u.data.length =3D p - custom; if (iwe.u.data.length) @@ -172,7 +168,7 @@ static inline char *rtl819x_translate_scan(struct rtlli= b_device *ieee, if (!(network->stats.mask & RTLLIB_STATMASK_SIGNAL)) iwe.u.qual.updated |=3D IW_QUAL_QUAL_INVALID; iwe.u.qual.updated =3D 7; - start =3D iwe_stream_add_event_rsl(info, start, stop, &iwe, IW_EV_QUAL_LE= N); + start =3D iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN); =20 iwe.cmd =3D IWEVCUSTOM; p =3D custom; --=20 2.39.2 From nobody Wed Feb 11 07:48:29 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 10681C6FD1C for ; Wed, 22 Mar 2023 17:16:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231557AbjCVRQX (ORCPT ); Wed, 22 Mar 2023 13:16:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231487AbjCVRQI (ORCPT ); Wed, 22 Mar 2023 13:16:08 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E13D664EB for ; Wed, 22 Mar 2023 10:15:36 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id y4so75951955edo.2 for ; Wed, 22 Mar 2023 10:15:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679505334; 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=PgAa8TVR2OX/unZOH2SqxHOaAsu+Q0rJ4jrl6aVUaso=; b=dOIyMCtrgEL4ivGPb4AKDAyxL9kGBzbcDXlkfMZI7sysakRjCTGJ9B3w1kX/4kwGKg MZVjYDKHWjv/zF+dwWBgU3wtOkoZI7ZWZa2bBQW8n06eKM0AIoUaPmKINL7Vmo7YBbrP u62zmbb13pr0lwAFdbQxg+gp5wFnGEgaGP+twreZIr/tFST4PNuqHYlAJJOzXqHciR6B 2TNU1MXFY5d2aXmT/lnoeCIlOGOighoUKN8QFLtUnn/Fq5p4/O+nTP7VUghmWtVcAuhU Y4TiFzIzzaDyTT2AkgdgVG3UAOgDhKRAlLrialpeM6+dLjkmwGuarsB9VqfPr3OrAYvW 8/8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679505334; 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=PgAa8TVR2OX/unZOH2SqxHOaAsu+Q0rJ4jrl6aVUaso=; b=xT7u651VRpo8awaBCIp/W3Me8Jc4cw5mOobhMME/bmKhdbLh1lND0uZnSdQqEC8i51 C7gOdkD7Te3nIr3fmIVuDnvrkChqFUJDa7t9PvKXt9VRcOaZPMNyHY9R3ZFOOcIMvwNY EbKoHwPnkiwMJxD7F5ihhYvyRdyii/MFcpMl5GIk38mKkx4Gxz5deEtliErh6U2DKz8q PS7jrXsmVZ4mjbtNAfGzguB6Zox0jbcb3EhNw6cHPCe35tXwAV33nhPgDWk2fgXOsYh4 orw21As9uaGaopKo945zHkqlxGsmK/i7DJzhPncUTUjPGz9Y+PGV8NEj+bxkBBlSvj93 XRGw== X-Gm-Message-State: AO0yUKXTsngDFJsl/kgsBIl+1ieagwaUtV7jKYtdyVCTM0orBiYI0c+k /lmueMaqVtejHGx+z1b1OmxbBISOa1w= X-Google-Smtp-Source: AK7set8ACwq2SguntQdO9FmuHbmEO07JY2DEp2AcZ4Hs+yNhFr6efWNtxKY//yiV7rjRFOngmqCXTw== X-Received: by 2002:a05:6402:2711:b0:4bb:afe3:e0a with SMTP id y17-20020a056402271100b004bbafe30e0amr8970955edd.3.1679505334307; Wed, 22 Mar 2023 10:15:34 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id a18-20020a50c312000000b004c06f786602sm8054214edb.85.2023.03.22.10.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 10:15:33 -0700 (PDT) Date: Wed, 22 Mar 2023 18:15:32 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 8/8] staging: rtl8192e: Replace macro iwe_stream_add_point_rsl with standard function Message-ID: <563af664b3186e73d99f73a6396f8ebcd3c52be2.1679504314.git.philipp.g.hortmann@gmail.com> 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 iwe_stream_add_point_rsl with standard function iwe_stream_add_point to increase readability. Signed-off-by: Philipp Hortmann --- V1->V2: Changed subject line to be without =E2=80=9Cf.=E2=80=9D --- drivers/staging/rtl8192e/rtllib.h | 3 --- drivers/staging/rtl8192e/rtllib_wx.c | 26 ++++++++++---------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 81d630cf7e52..1ce4c29dab13 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -65,9 +65,6 @@ #define container_of_dwork_rsl(x, y, z) \ container_of(to_delayed_work(x), y, z) =20 -#define iwe_stream_add_point_rsl(info, start, stop, iwe, p) \ - iwe_stream_add_point(info, start, stop, iwe, p) - static inline void *netdev_priv_rsl(struct net_device *dev) { return netdev_priv(dev); diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192= e/rtllib_wx.c index e580cd01c201..d6691f3c7c70 100644 --- a/drivers/staging/rtl8192e/rtllib_wx.c +++ b/drivers/staging/rtl8192e/rtllib_wx.c @@ -49,16 +49,13 @@ static inline char *rtl819x_translate_scan(struct rtlli= b_device *ieee, iwe.u.data.flags =3D 1; if (network->ssid_len > 0) { iwe.u.data.length =3D min_t(u8, network->ssid_len, 32); - start =3D iwe_stream_add_point_rsl(info, start, stop, &iwe, - network->ssid); + start =3D iwe_stream_add_point(info, start, stop, &iwe, network->ssid); } else if (network->hidden_ssid_len =3D=3D 0) { iwe.u.data.length =3D sizeof(""); - start =3D iwe_stream_add_point_rsl(info, start, stop, - &iwe, ""); + start =3D iwe_stream_add_point(info, start, stop, &iwe, ""); } else { iwe.u.data.length =3D min_t(u8, network->hidden_ssid_len, 32); - start =3D iwe_stream_add_point_rsl(info, start, stop, &iwe, - network->hidden_ssid); + start =3D iwe_stream_add_point(info, start, stop, &iwe, network->hidden_= ssid); } /* Add the protocol name */ iwe.cmd =3D SIOCGIWNAME; @@ -96,8 +93,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_= device *ieee, else iwe.u.data.flags =3D IW_ENCODE_DISABLED; iwe.u.data.length =3D 0; - start =3D iwe_stream_add_point_rsl(info, start, stop, - &iwe, network->ssid); + start =3D iwe_stream_add_point(info, start, stop, &iwe, network->ssid); /* Add basic and extended rates */ max_rate =3D 0; p =3D custom; @@ -152,8 +148,7 @@ static inline char *rtl819x_translate_scan(struct rtlli= b_device *ieee, iwe.cmd =3D IWEVCUSTOM; iwe.u.data.length =3D p - custom; if (iwe.u.data.length) - start =3D iwe_stream_add_point_rsl(info, start, stop, - &iwe, custom); + start =3D iwe_stream_add_point(info, start, stop, &iwe, custom); /* Add quality statistics */ /* TODO: Fix these values... */ iwe.cmd =3D IWEVQUAL; @@ -174,7 +169,7 @@ static inline char *rtl819x_translate_scan(struct rtlli= b_device *ieee, p =3D custom; iwe.u.data.length =3D p - custom; if (iwe.u.data.length) - start =3D iwe_stream_add_point_rsl(info, start, stop, &iwe, custom); + start =3D iwe_stream_add_point(info, start, stop, &iwe, custom); =20 memset(&iwe, 0, sizeof(iwe)); if (network->wpa_ie_len) { @@ -183,7 +178,7 @@ static inline char *rtl819x_translate_scan(struct rtlli= b_device *ieee, memcpy(buf, network->wpa_ie, network->wpa_ie_len); iwe.cmd =3D IWEVGENIE; iwe.u.data.length =3D network->wpa_ie_len; - start =3D iwe_stream_add_point_rsl(info, start, stop, &iwe, buf); + start =3D iwe_stream_add_point(info, start, stop, &iwe, buf); } memset(&iwe, 0, sizeof(iwe)); if (network->rsn_ie_len) { @@ -192,7 +187,7 @@ static inline char *rtl819x_translate_scan(struct rtlli= b_device *ieee, memcpy(buf, network->rsn_ie, network->rsn_ie_len); iwe.cmd =3D IWEVGENIE; iwe.u.data.length =3D network->rsn_ie_len; - start =3D iwe_stream_add_point_rsl(info, start, stop, &iwe, buf); + start =3D iwe_stream_add_point(info, start, stop, &iwe, buf); } =20 /* add info for WZC */ @@ -203,7 +198,7 @@ static inline char *rtl819x_translate_scan(struct rtlli= b_device *ieee, memcpy(buf, network->wzc_ie, network->wzc_ie_len); iwe.cmd =3D IWEVGENIE; iwe.u.data.length =3D network->wzc_ie_len; - start =3D iwe_stream_add_point_rsl(info, start, stop, &iwe, buf); + start =3D iwe_stream_add_point(info, start, stop, &iwe, buf); } =20 /* Add EXTRA: Age to display seconds since last beacon/probe response @@ -216,8 +211,7 @@ static inline char *rtl819x_translate_scan(struct rtlli= b_device *ieee, (100 * (jiffies - network->last_scanned)) / HZ); iwe.u.data.length =3D p - custom; if (iwe.u.data.length) - start =3D iwe_stream_add_point_rsl(info, start, stop, - &iwe, custom); + start =3D iwe_stream_add_point(info, start, stop, &iwe, custom); =20 return start; } --=20 2.39.2