From patchwork Fri Mar 17 19:13:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 71406 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp522088wrt; Fri, 17 Mar 2023 12:30:47 -0700 (PDT) X-Google-Smtp-Source: AK7set8SFbYpwaIZIjsoMqRGQZLmpm6iH+Bp7DjRxeb4kSsWyBZg4O2LOkXFDAWuSFYMVBBWHckc X-Received: by 2002:a05:6a00:1bce:b0:626:5bd:d33 with SMTP id o14-20020a056a001bce00b0062605bd0d33mr5601432pfw.0.1679081447204; Fri, 17 Mar 2023 12:30:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679081447; cv=none; d=google.com; s=arc-20160816; b=j89j8t00GVkwbaTglxO/ouRJxeK5Mm+fQplqvp6h7xpkdXC6MiYe6THD9yvPCFSc0y cuPoLSRZPSBsJjwmG/aMz6Twj0KdzjYbP951O5Uvycq8fPlMod0FJJZEzequUSuAiAS/ o70HLxyTFveFzqqoggGG6I/I/MjtH39SiqXphg+UUgJJK4Q6z0FuZZviDgLuSKeXkWhZ ZtxQCkCssFE41LYn0uyKMg3AQQEazAIfZwzTkEqsbKvKpjgsFUmZ04idi8IMXQfvryE7 PHu88lDDNz2aF6nmttfG0aSQGjgDexAz9z/SrgTruAmzx5A9GtlxXVmG/X35SwU9NeBH 3ZHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=UKzOWshBPa05sAfciXrKvOW4wl1rl1vuNJiyeVc0GTM=; b=p0vnOSCmN4W740h6ZiSW//cpZ5xj7gEOUrxYo86aQ1OYALLjHuofgqHPVrBQBy8at3 ckGzvsq8vVdIOPaW847fLIrZ0Jpnwni+Tw5o3uxED4zth2G7vifRfEMH+dk+xqXc7qd3 UH0lsWKYhExCzK4NJdzn6FLZ1Bpl2lztlC9pLxjNf3YVIB79lkgKwCUY4IHo5dyjxS1f NQyTChLaAzgZ+GHNEdftXAgK7qKO8ItvsDx8LmugSgbpcmpc5ATyvW1BXTvd3DJtKhx7 Fp2KV0GzSALp9+5yf4CJYo/7InfYgnA9No/ngWENP1gx0mb4wA9VQCpSW/MUwmsnu/vT eY0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=g62TFreh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v16-20020a634810000000b004ffc2ec1b51si2988484pga.271.2023.03.17.12.30.28; Fri, 17 Mar 2023 12:30:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=g62TFreh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230058AbjCQTN1 (ORCPT + 99 others); Fri, 17 Mar 2023 15:13:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229903AbjCQTNZ (ORCPT ); Fri, 17 Mar 2023 15:13:25 -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 3878CACE22 for ; Fri, 17 Mar 2023 12:13:17 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id er8so12527830edb.0 for ; Fri, 17 Mar 2023 12:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679080395; 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=UKzOWshBPa05sAfciXrKvOW4wl1rl1vuNJiyeVc0GTM=; b=g62TFrehsNWj46XzWopy/vG91KbP9iseFu9asa7oEBELOPeEhPkTWdw1bNPo1Jj3KU ld2WGBlrCFpEcZghiSkrvH/IMlG+cdq3XdAI2eozvqqg2R0iv/2r2RP7zQABWqLHRaVh 0/CUz4Awh+OK8d1Je9sBZvKSACUkqnCIJSqnr8fOhGM4MZ5ZFDOPzmRC8ki3yBTEZrxS 4FRd5KK3lVICHBBSSYqZNFqxyaS8xl4g8on9sf/LvUrJ3shnTy4IJL+iw8VFPQEdtkl7 Zx+AxM7X8PlBANtP4M2b8sgiWbWbNDKvsn/KLvjPd994U+KhDrP2XqqD6fDcc/8RF576 4jkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679080395; 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=UKzOWshBPa05sAfciXrKvOW4wl1rl1vuNJiyeVc0GTM=; b=q/E1cIcXD2ixLgE7K1aHnsEoVBeMgftCQ0UtSYiBQEr+l1/dukqUgxKFS7JjAoef7X 6rLfOeMHWYwOYw5n4+kiZj6Hz6yrmRw31ZRfVheXJHBs99U8R2o/1ylcOr8jrDxrvVIe Gh/Hz4Vl5aCacHHVKn4oJKW+OvZFlrCuwhthmP+KvpWixjwRjo1TZuTREVzCJkayoB1Z uk2Q1P1pflGiy/Bd6n7gS8ebeWDtFJAoM5rXteHkIcldNbaM7+VewLX28elzLaVEzNFV Rwytfado0n89QxVG+C8bQzOA8DrsPOpYmN18Y1WgZWkYqsnsDIs05l3O5muADPxeetDi vjpA== X-Gm-Message-State: AO0yUKU7lnTKKbdeWjJbTVDi6XR950AVQWyE3te4zepstJMFZ8rP/i3/ 30yD68NLcdi4yy2sHSe2tnw= X-Received: by 2002:a17:906:1016:b0:931:5145:c51d with SMTP id 22-20020a170906101600b009315145c51dmr4697756ejm.0.1679080395458; Fri, 17 Mar 2023 12:13:15 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id kx1-20020a170907774100b0091fdd2ee44bsm1280097ejc.197.2023.03.17.12.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 12:13:14 -0700 (PDT) Date: Fri, 17 Mar 2023 20:13:13 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/9] staging: rtl8192e: Remove unused variable rtl819XAGCTAB_Array Message-ID: <0733800b195d4f63cce2ef2ac114943c8c30f587.1679077522.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760644507316916979?= X-GMAIL-MSGID: =?utf-8?q?1760644507316916979?= Remove unused variable rtl819XAGCTAB_Array. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h index 6723fcce8954..fd34756e450f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,8 +9,6 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -extern u32 rtl819XAGCTAB_Array[]; - enum hw90_block { HW90_BLOCK_MAC = 0, HW90_BLOCK_PHY0 = 1, From patchwork Fri Mar 17 19:13:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 71402 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp517634wrt; Fri, 17 Mar 2023 12:19:31 -0700 (PDT) X-Google-Smtp-Source: AK7set8vR89PE/kucIbvCTmz44/y47vraEaOCoaUPzljJBo3k5MsqOey2JbVcg+R+RwReZ94esDW X-Received: by 2002:a17:902:e852:b0:1a1:80fb:d040 with SMTP id t18-20020a170902e85200b001a180fbd040mr7894094plg.2.1679080771386; Fri, 17 Mar 2023 12:19:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679080771; cv=none; d=google.com; s=arc-20160816; b=bxsN5yC2hNn5xa2xxUwjVfD7aGyNZQ7BKRnDPwWLumOzLk6ftKNlaBnTtdTExah9Ma /4j0ruTEKBfl4N65q+waQ1bomEtIEsEjS8pEvom0p//BPx2e7bmKQfYVq8zcohv9a+sP 4cuUBPk8T+o0IUJb7nAmAsamY/8XtAR+AwlsDrypRg+HlVVWtG2i4NFfFpzDugQJ5vTx E4agMIWjbQ0NQI1kp/YKCbM1dHIIOFMZpapyRaLrDUtds9sDZCVuFONd/1p1oBxKapd9 4au3AfrjYEkS0QGxeKgq7Gmb0E0yASVB8NV/rVnwjiYv0jrA2ccQ3REUO71daGHEDzlx RUrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=0/tOVTwHPYMxKxFkN8GBzVBBS/KLVnVcYggCNSJXFWM=; b=cUPvgueaRBeOCYv9WTyA54fhvmNPKsJSqYLk8u1WZOMbfwNHouQWjVfNKP5oMEbCAp lDNdKxgpt03IozoCU3iNLFbVWPvARQKMkk6hooMvT64cSXdscnTUnOIYhDNZy4oUP6z2 GmeCaj9il+NIsr5PgVs6VJjXbHud41JRxENgr6YxI9SppXiwmMTIrumnS2GohQyHl559 jC5ztCx56Zz4Rp/sntyf/jGHfNY6PCTBVawDdGVdeLzQlF8QQGvtZLH+Ys/yl9REIncK +/L3qYFz4feOaR9amgpYwQJLqrNq5NMEDs3EIFxYuiTV7Ck3FVFUAKWM+BX1BVuMuhHq Wkow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=RVjSi1xl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y4-20020a17090322c400b0019cf7f260acsi3475872plg.329.2023.03.17.12.19.18; Fri, 17 Mar 2023 12:19:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=RVjSi1xl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229710AbjCQTN3 (ORCPT + 99 others); Fri, 17 Mar 2023 15:13:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230080AbjCQTN0 (ORCPT ); Fri, 17 Mar 2023 15:13:26 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 928DDAFBA9 for ; Fri, 17 Mar 2023 12:13:24 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id ek18so24254400edb.6 for ; Fri, 17 Mar 2023 12:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679080402; x=1681672402; 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=0/tOVTwHPYMxKxFkN8GBzVBBS/KLVnVcYggCNSJXFWM=; b=RVjSi1xlwcd297KIx/onBcV5sHO7ipIEUYocW6s5jq8wBgoF7WpY3fT0US4SJbZrJm lkRUFWPSwqtNp92YqK8FMO5Hycg/irXxfVG4YWNsIZsbKjBvEHNxJfNZ3lLvWFZRBJ4q YSOFPhGI6bzwww/0gUS2lWrtQXeBL6PhHwpDaNyj5cpdinc6iuKpcHmTvGrIeDXq9IFL oLjSpL11E2RjS8XJe8aWBwi70KmxaYKpzJcD+TMwPMs6tavePcQ8v2pU54phJn8UU0cE YiHvY3vuw4p9A+iqGXBU6EHjm0Ya8c/pRtFTAGgiFcbkX3YqFzHfHSJ0SsVm+T0a2OiH bh4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679080402; x=1681672402; 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=0/tOVTwHPYMxKxFkN8GBzVBBS/KLVnVcYggCNSJXFWM=; b=PKFrOXPh1ha1mfAFokRX2b1CTSh7R3UDP2s89kCzQuV5UbDBpuzuGbOzW47vScw8Vq EV2iOkqgxTAuRwDPmURhrQN6DYPnoLpqdRO9iiGs8xxQC2BoZO1v9hJoTeS7kwuenHzE 1flBFRhCt2C7jbce178BXWBncuAT5xagm5eyEEFvvGprQrQQzNKretHBDmKYq/0ojWh6 63Q5OgQbFTmvzdV7t8WlTlY7iIeRZ+Ty6tCDs6HrsKeeXKITS3U/k+2xKf5jQHKDtvH6 OtEbX657EmXz6CAW1c1EthbYSljhnqSdqrzH1Fo2f4poJfw8CprRIMYR6zI/irMuhMaq MR4w== X-Gm-Message-State: AO0yUKXeK2lrGvOqSr4SeWDJ1Hd4Wz6WbpC6fKeA4bn4WlYE/6FSyyU2 0VQshvARWIHF+ZphfmufmTw= X-Received: by 2002:a17:906:518e:b0:929:b101:937d with SMTP id y14-20020a170906518e00b00929b101937dmr6646857ejk.1.1679080402391; Fri, 17 Mar 2023 12:13:22 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id lx12-20020a170906af0c00b008e57b5e0ce9sm1272413ejb.108.2023.03.17.12.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 12:13:21 -0700 (PDT) Date: Fri, 17 Mar 2023 20:13:20 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/9] staging: rtl8192e: Remove double defined constants bMaskBytex and bMask.. Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760643798703509968?= X-GMAIL-MSGID: =?utf-8?q?1760643798703509968?= Remove double defined constants. Signed-off-by: Philipp Hortmann --- 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/staging/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 }; -#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); From patchwork Fri Mar 17 19:13:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 71403 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp517863wrt; Fri, 17 Mar 2023 12:20:07 -0700 (PDT) X-Google-Smtp-Source: AK7set/dQ8GvsnB9cbzGRJbSqCFwQzSbKrET4mzOVWmmCcuTh+KeuBcmdY72b/KzkbF+Xd9Cmoiy X-Received: by 2002:a17:902:b682:b0:19c:13d2:44c5 with SMTP id c2-20020a170902b68200b0019c13d244c5mr8599397pls.3.1679080807036; Fri, 17 Mar 2023 12:20:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679080807; cv=none; d=google.com; s=arc-20160816; b=JICHsreDnVZlMtK013eOrlF3+t0Id5zJ8sOo79hxALEfTBTZtRGfFpsG3j4LPQzL4v TG+Ta7KqAZnfAYixyol/RPQ+JhXEC7UkFfMCi2Ur/HP1VzjN3MoGLJfP2TG330VCHEH7 /WmI3qqcHon9DGd6ne1mJaJzXM8Zc2+cSTiLFUm0bQ7inRDgKJw1FM4OR3KsvfT9wWvA tZRvrOlAH3TQBLi2c8uobhrRsDuEB3CJvI5cwSylDdsUDJ3/yPPHaPcDHCuCNyahjgN0 Qke/qpqi5MHwTnY4mvxE2Gs4y311s8cLEYM/B+9GXR4B1yzG35lzvHY0bCFX9B9LjD+s 6uRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=WdvGLimWlyViKT5AvlOeO6Wk+zSpkACpdO1SpV6s/lw=; b=SIdEZ1HggFs7RALEO3P65Vc8NvcNgfssjO0ipRuZmcvscVvq2v9agnRgambxgJJunO R0Ni2tUW3EQJjUkIXX/+urPPp3HLgjcJ3LTlijcNs+blcLlsl3729EqiHw6jsA9a2zlz PzGzCMu7OXdn2q8F1O0YvTSpKm/g6HMGx4k43iyfeYm4DlJrwJlLZ/9pw6sWdLp8zYX/ TRr8bZfG18IDM8WXHeCLdggZrcI1EOLeQEWCaiSuOgsaqfuyHe+RX0i/xhly0KOPNcZM FlrBwx7bK3NrXdWX4TVThJk1ua55IYhDYEUFgWktFpXc/Ld6phj0GbwMqNe8r63VFTlX xM7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ye4AH+lF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q14-20020a170902dace00b0019468fe44d5si3420987plx.233.2023.03.17.12.19.51; Fri, 17 Mar 2023 12:20:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ye4AH+lF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230148AbjCQTNk (ORCPT + 99 others); Fri, 17 Mar 2023 15:13:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230141AbjCQTNg (ORCPT ); Fri, 17 Mar 2023 15:13:36 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B11C3E1E6 for ; Fri, 17 Mar 2023 12:13:29 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id z21so24299036edb.4 for ; Fri, 17 Mar 2023 12:13:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679080408; x=1681672408; 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=WdvGLimWlyViKT5AvlOeO6Wk+zSpkACpdO1SpV6s/lw=; b=Ye4AH+lF1JQ9QT7C2JKPCwHf5ic80KnDEqxrGQnMgHjrORQW3VFRHZxeNxHtPzGp0w kTSaapUvLzFiD2G8yIFQk5fEn0bx6WX2A1FBJ2FpaAkgyFhhTacaCEqZTZkK9460HClj kKJBgqaRpFynMAYZ7u59x5Hv2Y7NBjGtM5z+RMtp5ryWkzTUY/wtniOZ3zlXkQaDtQR7 M6CayalS9qvppGw/ACjtCA77UIkdL1mviKXgUGQ3ggXKlFvxtqNfDr3wvsB51RJBjqSJ 0pRO/VATExCVwb0NedhFlCOKQ5RdGK1B7nsoT25ccWF5Eh2FmoDNEZ+tLVbLxuyp05IA 2T0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679080408; x=1681672408; 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=WdvGLimWlyViKT5AvlOeO6Wk+zSpkACpdO1SpV6s/lw=; b=sjHt61NQ8sodityRVdLobxaoMug+28MTkiyOH7AuPGo1fRHFbU6AFEYsUsmi/zRfGP 1LfNE233SoHg1Cj/gPYwSAnXFPpy9MmmztvJEcFOD14ffYRp/EOCezvBIxifFJ/YyFOZ OgjLgxR2MaFZa4T/kn2pD2xVfNDH6eWEP9R0FaCNeN7EIk3JFTMedPilU7axiwO04T3a 2DjVKpJ3o3MKHeuYCj3BSA2WoMIp/4hJ72PP/afc/nmwrB/oafSbNqzNB1aFgFgmMk2q NDAZM8OLt2t4h+OWVd/6cVWgdTJHBMsELQPwnZHvNctWkO+94fQWZYOENFoEPySvY17u RXHw== X-Gm-Message-State: AO0yUKWoi+ha3iQBnWxw8paPtxT6Yjx8vATZd3EtPZFpojjZEicBNIam BIexo7U4zch+CzDNlikgpoZ/AYBYCAk= X-Received: by 2002:a17:906:213:b0:931:5145:c51f with SMTP id 19-20020a170906021300b009315145c51fmr4773605ejd.4.1679080407988; Fri, 17 Mar 2023 12:13:27 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id d1-20020a50cd41000000b004af720b855fsm1448742edj.82.2023.03.17.12.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 12:13:27 -0700 (PDT) Date: Fri, 17 Mar 2023 20:13:25 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/9] staging: rtl8192e: Replace macro skb_tail_pointer_rsl with standard f. Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760643836595394469?= X-GMAIL-MSGID: =?utf-8?q?1760643836595394469?= Replace macro skb_tail_pointer_rsl with function skb_tail_pointer to increase readablility. Signed-off-by: Philipp Hortmann --- 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] = skb; mapping = (dma_addr_t *)skb->cb; *mapping = 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]] = skb; *((dma_addr_t *)skb->cb) = 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/rtllib.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 -#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) From patchwork Fri Mar 17 19:13:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 71407 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp522421wrt; Fri, 17 Mar 2023 12:31:27 -0700 (PDT) X-Google-Smtp-Source: AK7set/ByGVwVixduKbmwqkaG3Ov7kjKLVrXL18H9NoTddD9FOAzkoK/7Mk8gEI/Rpovp1u4KxDt X-Received: by 2002:a17:90a:7182:b0:236:7144:669f with SMTP id i2-20020a17090a718200b002367144669fmr10290416pjk.2.1679081487405; Fri, 17 Mar 2023 12:31:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679081487; cv=none; d=google.com; s=arc-20160816; b=z3l+3M8Tk4kZwnnssdn1pAIPS9UAUbUenBF3VPflM9U18iRosEFdV7Ljh46sGVFapP yT4EAYN7Ot0ULZAy57p3KI1CTGlbsl+OfojfqP36WrDYkG5GBcXENxE0rYMpjjOELq33 kgdpsh+ClqckSciYKxFci9/8n2IHL7g9H+mn2/kX2VHqw+elSziAITygFHjHDox2x5du 6lJ2hpm08C2Fo6sl8xVMayprQhT5HAmNVCIVXJMvrIrDeNo/GJY7+PGHWZ9K8i7lUUql wTyJ9vA9n2qHGxzkGXxUwi4EwErRIUFJ1AaAnyAksWWI5CXxulRjFJcjnsSGQAWAyZBF vm/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=kU/IS1dtYj57qCBoVq56ZCvXzu4g9U4ZWrc/U3hX9G0=; b=H8jFxmmCp5iqsd+BPlECK449uMnHAmI69GxIZje1AZH5a+JADGtwDNRmt1OB3YzxpG //Zhx06q2bfgo8fJKfr1xt0G6Hhn3QUjShW4PhH/ZR6rl6Q6DoZB0MDHMhU7TRBu+otQ OrINCAG5wnRuuuzFRbxf6U51KxrZh9EWaZzQC2/twmtU7ntgbhWqaO1aDDR5wrvQhhVH 02HpFUlOYUrMKwPw2/Id9QXlxYs2F3Xyec4QNMN3hwWaxhfMl9/vPMELWho/GYdnPu8c +cdcPRhn4p9km84ZFYRvMsqFpaz3eZx/cMUEBmk0beSppS0vjXjBGvl69WeC9fzHzxyh GgHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hzaM0uxj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a3-20020a631a03000000b004fc39adf481si2814521pga.381.2023.03.17.12.31.08; Fri, 17 Mar 2023 12:31:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hzaM0uxj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230129AbjCQTNu (ORCPT + 99 others); Fri, 17 Mar 2023 15:13:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230147AbjCQTNq (ORCPT ); Fri, 17 Mar 2023 15:13:46 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08BDFE1FFF for ; Fri, 17 Mar 2023 12:13:36 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id h8so24221577ede.8 for ; Fri, 17 Mar 2023 12:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679080414; 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=kU/IS1dtYj57qCBoVq56ZCvXzu4g9U4ZWrc/U3hX9G0=; b=hzaM0uxjpk4JIjyY/zbeCSZcL4ShubyS/mTSxEoPcqjdlr6BXMkhdYF8e/4jpOZROk sTH7TJCnbsaDutp46WT4/qVwEP42qItLbZtAWQdsSctVM2XeFEII6rOxHh/4bfUdc2yf 086Kmf4Ag9XKfCBRENmlk9VW8TiSnDZYi2hnmqq42FXXIFnxaLB4tqa3u9sE+h1l2Xfp m2fTEnjmQh71MLsPHHQ4zGf9J82gPGgfKyrIAggrn3rmvw7uEocCqx4eLakYuBWN0imG loUdJ0iI10L+9OLY4Bdd/RWCd5zQHRJ3Rg2Y9rjRuwC/x+ehH6RbOz15DBw2IjytdMGC bmbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679080414; 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=kU/IS1dtYj57qCBoVq56ZCvXzu4g9U4ZWrc/U3hX9G0=; b=vfZ/+Py+sbbLyyVkXAUx/F+ZOi2FBb2E2cK43BD8T56KfwL18FU5FvZh//8UDmdMCa 6O3qVX2NDhvTxjPAhJwVDZk/aX8PKYCcd5/+WgcyI+0rZOSmBkEANN63CBYJA/ol+a1Y FpI2hXfcbxXteMgGO9g/F5/w4oq5HIcme6pyK7mnFeCJQ8QMsXW5E4mDi30g2yDOOiB3 Hax8fX7tfy0PkuaEEF5BSKG6HKOL6hezmuiZV7RVowDoFPeOAFHmHbnpOS+g0OREcxEJ JtpLKtUqjJ1ZAGu+fMmKUu9NUr2woUkPISUfn95oJoWCuCQHWOO3tSvho8JFt/sXs/OB FOeA== X-Gm-Message-State: AO0yUKXersWwNwswOUxqtt83+H7IzcsX2WVkHYAd7tRzSVFz68oIgY1L crXw8ebAvco38ONoLykEBES8g0EXw+Q= X-Received: by 2002:a17:906:7394:b0:932:170:e07b with SMTP id f20-20020a170906739400b009320170e07bmr2773690ejl.7.1679080414616; Fri, 17 Mar 2023 12:13:34 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id i27-20020a170906251b00b0093128426980sm1294304ejb.48.2023.03.17.12.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 12:13:34 -0700 (PDT) Date: Fri, 17 Mar 2023 20:13:32 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/9] staging: rtl8192e: Remove unused macro queue_delayed_work_rsl and queu.. Message-ID: <4f08897d188c61fc2e611afbf9f2de2ba18cffef.1679077522.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760644550168457450?= X-GMAIL-MSGID: =?utf-8?q?1760644550168457450?= Remove unused macro queue_delayed_work_rsl and queue_work_rsl. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.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 -#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) -#define queue_work_rsl(x, y) queue_work(x, y) #define INIT_WORK_RSL(x, y, z) INIT_WORK(x, y) #define container_of_work_rsl(x, y, z) container_of(x, y, z) From patchwork Fri Mar 17 19:13:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 71408 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp522521wrt; Fri, 17 Mar 2023 12:31:39 -0700 (PDT) X-Google-Smtp-Source: AK7set89gdouYxBX4EXekl+GYYeoEKDLatMDObc2SnCS2eKKp8oXbBhV7HTzKOk9XNEWyFfds665 X-Received: by 2002:a05:6a20:8e1e:b0:cd:ed5c:4ec with SMTP id y30-20020a056a208e1e00b000cded5c04ecmr14479933pzj.3.1679081499434; Fri, 17 Mar 2023 12:31:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679081499; cv=none; d=google.com; s=arc-20160816; b=c+LJXaYDD/u6qSz2kQO6F8mVxwOjc7pfdVSCDFcIceXD5fvNfpwDIQM0e6rssRs0ek SpMfc+7p5EQg5I8O/YlLRRu37ex9wMkaGKpjx/XDCgOX6oNeHTNhwRrgYP+uO1oTcq2F dWOKmUgMaFBQpCFAG49z52APJ7n04+bdWo7sjKFjhLpHCbqP1bkWEXXBd8jsigXItehq RyCXx4TUdB8bitf0NnqCgi8DodqpWYnupZcv5ZRoCycf6teyKOJUoBRgKYmjRh/0cUDV 84pum51OLcQmKdE3AOvg6UcsWOcmVEZyc8YiJQSAIpZAst3jO7/QDW+fweAQAPm2Owv7 yXtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=WjtT+UNbmknzeDI4lxkQZjhyjKyi9xDEJK9zSTQV6XY=; b=DZjnAvxFhMKx9xTO5vzQIS1J6bnsjEqsvyOmo1bC9CQRUoBJVcuwr7M+3kcop4QB0K VHhCgaBMkC+saxnabXULD2C+BEsETGTwaeMBIijBdK4lbJkmR/wwMiY+sogDmOEkEFas rcwImoy5Go/3JSMfpugbyaunYQOdtuEiYefLngsGSoTHO9DxzXzOZvEwqgF2VE1eFkqW XThZ3xPZJTxtaq50ovme8O9t6mL79OFTcIFgyP51XrJRX1yv6n/hsIlyCGx0DHb0C2sP 9xzytQ084/sdmalHa+wQMp9IJrWu83N8rtPTsElXci66d/kbXi0pW7GKwzM+bGyasK0S znTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jAGZo8mw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x71-20020a62864a000000b006233c7e8887si3225246pfd.90.2023.03.17.12.31.24; Fri, 17 Mar 2023 12:31:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=jAGZo8mw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230034AbjCQTOC (ORCPT + 99 others); Fri, 17 Mar 2023 15:14:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230167AbjCQTN6 (ORCPT ); Fri, 17 Mar 2023 15:13:58 -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 9886BE2539 for ; Fri, 17 Mar 2023 12:13:42 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id w9so24319459edc.3 for ; Fri, 17 Mar 2023 12:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679080420; x=1681672420; 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=WjtT+UNbmknzeDI4lxkQZjhyjKyi9xDEJK9zSTQV6XY=; b=jAGZo8mwxVKdF+xe3v5y+QhJ474y5Q/pJ2shxKUgG36alsl4qIuIks5dHvQryKXkWM ExJhDDWZ98r9E+SiOrNSHQ53kfnF6EvOxphBJTtvXR0985UZmYWCT2wH1z3Y+/sHXCXC fv5tmcxOHuSEE5eI9yTvck52wCl4iFu9SUYrHKBE3sMAofKN1iWBgeZWjV/5yurbDKam 0JVkfq5Yoxopq5iOO7hxy2EhPrFBX4COqHSOPkvM94pONF7BKZ/TkPx7v43oO/MjnnJF FiskofLlvBglTqO3oY0Paxbh7NOdb3G2X3ki4K/tkNYpkNnzqHnzsiUmvjeuuyAJxRuh M3rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679080420; x=1681672420; 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=WjtT+UNbmknzeDI4lxkQZjhyjKyi9xDEJK9zSTQV6XY=; b=gnWhUDkKrY1e7bS+XyfJMklu/eG/AqnPnOmd4SyAbfKWkxwddwGS5dlIYbLBUhNJQm eVBc5rt0QePt3PwMZdjmXSRYQP0U0A1lOPrt7vJ5Nz7PifWwTMbF4nu69bRctD/wA/Ed OAdwVAd/oLUEMZiNLLuGj+xV/A/HqAZn/FMrXXAxLOG9vD7X0I0MMNCe0t6fS28GWGcb OI+bxnwgM2/6yZqph+yOqtlnznCnwvxQkWuyXiAW2OxQBfJpzn1r1dwb8RxtJ5rEpXMi HbOu6VoPK/zMAP61qmeU/AYBm6rR7Csg3aN47i7vx5Dk98mw8LW4csBPvvpyGtD17rHs iUvQ== X-Gm-Message-State: AO0yUKUvzBegIb3Ed3gjBthGJEI0Pj0ieRx4hm+Kl5nl4Oae0VdD9CfZ IwqpPo3CKWbtSVBaJT1qh8G1GHiQv0k= X-Received: by 2002:a05:6402:354a:b0:4bc:edde:14e2 with SMTP id f10-20020a056402354a00b004bcedde14e2mr9297287edd.0.1679080420672; Fri, 17 Mar 2023 12:13:40 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id z21-20020a1709064e1500b00930de1da701sm1305591eju.10.2023.03.17.12.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 12:13:40 -0700 (PDT) Date: Fri, 17 Mar 2023 20:13:38 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/9] staging: rtl8192e: Replace macro INIT_DELAYED_WORK_RSL with standard m. Message-ID: <69b1612c05a0fa0334704eb94d80f771ada6b35c.1679077522.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760644562127031399?= X-GMAIL-MSGID: =?utf-8?q?1760644562127031399?= Replace macro INIT_DELAYED_WORK_RSL with standard macro INIT_DELAYED_WORK to increase readability. Signed-off-by: Philipp Hortmann --- 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_tracking_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_wq); + 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/rtl8192e/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); - 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_ctrl_gpio); } void rtl92e_dm_deinit(struct net_device *dev) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.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 -#define INIT_DELAYED_WORK_RSL(x, y, z) INIT_DELAYED_WORK(x, y) - #define INIT_WORK_RSL(x, y, z) INIT_WORK(x, y) #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/rtl8192e/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) timer_setup(&ieee->beacon_timer, rtllib_send_beacon_cb, 0); - 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_retry_wq); INIT_WORK_RSL(&ieee->wx_sync_scan_wq, (void *)rtllib_wx_sync_scan_wq, ieee); From patchwork Fri Mar 17 19:13:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 71404 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp518397wrt; Fri, 17 Mar 2023 12:21:21 -0700 (PDT) X-Google-Smtp-Source: AK7set8NdcmdLunHzUKtxRk3VSVa4/UDUWAMJKPSGY9TDZRDVepUMvjPwIG0lMKq5113ATk9/Eb/ X-Received: by 2002:a17:903:32c9:b0:196:8d96:dc6b with SMTP id i9-20020a17090332c900b001968d96dc6bmr8603756plr.2.1679080881158; Fri, 17 Mar 2023 12:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679080881; cv=none; d=google.com; s=arc-20160816; b=w5LIKfnws88K79cuq7x9J9MiJPk9h9ZV297j/Kx81vA+2b5J4pEDZ+kGfwkF5s+CcZ GHeStKhzvL1iB7LtZ5kX7xjR/qQHfWlRxTh2os5tVJI7XyBEY+gFOLkrA+1LcS3KUP6X B8ozRyQr/BtgbO0QPs3TibVGyqPaEjhYl/XrhkDEoTvCegWg67bO/NyxcL2rmO4dxcft WC0tX9Y9PpLMPQbrIz++icLo2HY4vOx5nGMnBKBBn5E3BbkzEqz641/SIyADPZm9oY9g IWBVVySetFaD09O1O4so8IY/uRtHg7YGlewHUASSR2vrM8wbHDyRpuTgawV4zrQo91mH yXhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=JECvJ/K7E4yzQQFzJdiJ4lI6M7UJm3etUVtp/7RJfO0=; b=fZNdzkO4Qz0mXNkj4qRdbDwl8uFrk0Nnmi1gugu3OP2Z7S8TDoiunckRH/1GxTJq4V zL7Vfn84KyaTjSSLJT6sWQCeJCQgVM3bysqpy6RNPqjKfqJQBCXP5eSSbqwFeJAsAQYN YU7UIqRiO5D3Rojp85yBCmup9yUP/O/yikO7nbFNDzMSwchELKSUoRaj5tD7TwMrAVsd YTeq+qxFAy6f9OkQjUrbUJYGe0G8Xhpvz4NO/Ipc8hYxBf0QkPjWPUmW3P0BW85kmyo2 B6l3+i1cpafEPI1zsE8fVp0bY6j+FYrs+/bqw/FMApVlOPy3d/DPSWmuW6zOJs6pxa78 xB2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZDQWi+ru; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d18-20020a170902e15200b001a0528c188esi3036998pla.263.2023.03.17.12.21.04; Fri, 17 Mar 2023 12:21:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZDQWi+ru; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230135AbjCQTON (ORCPT + 99 others); Fri, 17 Mar 2023 15:14:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230163AbjCQTOL (ORCPT ); Fri, 17 Mar 2023 15:14:11 -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 7D9D5E1FD0 for ; Fri, 17 Mar 2023 12:13:49 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id cy23so24167889edb.12 for ; Fri, 17 Mar 2023 12:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679080427; 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=ZDQWi+ruPIg0G7N1WLOmgrTJdAETbuUbp4EiT0FBT5d3uj8cz9XfxioQJct/kgjey7 V9LV+gBmkKwAdUNJOhaE3ONqW/g8mqs/kIcdx1Hih6grFgSTjNrtlE60sQanMmygQ/dA 6LmWKzAuUG9tie6ce9+xkz1dIS8gAUBRjPkPJyJaqBeYH1zZlO8E8T6ubR0iyUal/dCj 72zCQKu0yX2qnLP30sh35ku3XpKcpGZs3EXdoHICfcOLAHMSapBEto6B6iVvA9GptXOS 2ct6k+7w9ztNOZ0U9BJTCo89RdiDe/dW+i+a/AGY7hiIjpKf5RMaxTmJxBmYaBhRv+Bj 8AJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679080427; 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=jx2oGGuA0MBsXridXMVLIAKPis8z6YZiwSxYAeSXPLf8eMxPHK/W7QaLjShvWSfN6V cUPItW2wnoKnPxVmrFihH5t5yZ3Qh2upVvJiNDtw7a2HJkuqY+/9phEbz23NKmNXSHEm HEePQP0uiZMOVwZtHsNDddJsD4AtpiunpwGMPd9haYJdjcJzgCt037qNNwbH4eVU26Bd wR4bSSJZmkE9g8/Ic115RSCEdSMZta7N1m9xs+Pfvdn5jjvEgfJkoBQfRGqpaDp1olKW TDNFyQ9taE+K2XUtXlwK0jR3MbML2Ck5OFUxVMRiFhxECD1MS5CSDVWPMeEnDbLrTSl4 xwNw== X-Gm-Message-State: AO0yUKXlnvhFFrTeVbWWnfEZMCLitOQb/106CqQP0BGJmGm1eO4Mlr4T /JEoPUDZ18EUzv7cSyWyeHg= X-Received: by 2002:a05:6402:4413:b0:4bb:afe3:e0a with SMTP id y19-20020a056402441300b004bbafe30e0amr9497125eda.3.1679080427128; Fri, 17 Mar 2023 12:13:47 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id u6-20020a50d506000000b004fd2aab4953sm1458761edi.45.2023.03.17.12.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 12:13:46 -0700 (PDT) Date: Fri, 17 Mar 2023 20:13:45 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/9] staging: rtl8192e: Replace macro INIT_WORK_RSL with standard macro Message-ID: <56290976510575f3b17ded786c452a9f6a52a7ee.1679077522.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760643913734584435?= X-GMAIL-MSGID: =?utf-8?q?1760643913734584435?= 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 = rtllib_priv(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_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_tracking_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_wq); 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/rtllib.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 -#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/rtl8192e/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) 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_retry_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); mutex_init(&ieee->wx_mutex); mutex_init(&ieee->scan_mutex); From patchwork Fri Mar 17 19:13:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 71405 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp518749wrt; Fri, 17 Mar 2023 12:22:09 -0700 (PDT) X-Google-Smtp-Source: AK7set+U3KF6r4Ezsz40T9bWe5BxMDfhqkli0yOX0J7m6j7A5js8Yc5OxCjEE5eW66EtjPdNwtAt X-Received: by 2002:a17:903:41c5:b0:19a:a815:2877 with SMTP id u5-20020a17090341c500b0019aa8152877mr7815320ple.6.1679080929057; Fri, 17 Mar 2023 12:22:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679080929; cv=none; d=google.com; s=arc-20160816; b=p0apkPGJnQTCBy7FovVwOluhwBo2Lbgxy00v9zwbSq6ykUQHXS4iWvp3nv5Tb6tZ+K ookvgpy0yg8BBCq/6sP8c6osSJhbXhsIaUDndbgIP0MKLJCViKqVuUiwQ4WKVNeuuNTX R1gWcIgTvqlYjEf4mmq4zancc7rLFwKnwHzwtnjvTcehLWfknmXaX9kXiYomc+S+HzGB KSD1lePJFBQW5UNI4srfqOJg2hYPznvRlpmZ8SHVne4PA/fLUtFIxcDPOuon7IajGDb7 oq+W4iOK2ZdFpj1nvZjYgkMhGO6IifH1YD/kkS/9wicjg0xH6FYdBJYkg22E55z4BBRR RvVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=Toyfbf+SoovM/Ffd1wohbkyOgiucLUqCVM5bj6+KSwQ=; b=Jl3s5nnRjD22nQL3FxZIxz90FdWksqfz5Ar8DZsTlwaz4b6fm5MKWq8Axa4f3tv0Ne YHgbfVhkWTcoEImuPHhAssi1aUlQIpZYW3X0vzPhbl/51OZ/7+YZe3WayztCufJx6eVr qTJ9FVO/NcmMcFi+if2C68iQU0EGDSMEhAtNjROkflOfQ3+840CwIyo3gzHdu+DGhBds +pygIJTjM3GugBPuLbUPdB9fmcgLu5Ww1Vq1g/VG89To3MMpM1lmucQy4LVyEU2WClih OcVqRRVjcagp3FWGBuAPxYMsChb2GhfSIi3BjFogk2JHtONejFFIq6se/Tmi1uTvEgV8 PPmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=P8CxN2t5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d18-20020a170902e15200b001a0528c188esi3036998pla.263.2023.03.17.12.21.47; Fri, 17 Mar 2023 12:22:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=P8CxN2t5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229603AbjCQTOa (ORCPT + 99 others); Fri, 17 Mar 2023 15:14:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230242AbjCQTOY (ORCPT ); Fri, 17 Mar 2023 15:14:24 -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 4AC86E41D2 for ; Fri, 17 Mar 2023 12:13:57 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id w9so24321634edc.3 for ; Fri, 17 Mar 2023 12:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679080435; 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=Toyfbf+SoovM/Ffd1wohbkyOgiucLUqCVM5bj6+KSwQ=; b=P8CxN2t50zW4sh14dk+9j5eTgQg32NMyiv6U8kkgMQLC4bR/jtw9+wmNXHnqx8gS7E t4DpMRZyR1Zu2xahz4BmIxZXOusyiZ1/W1S1gPGNSp8LxrvYSEX2zrPfMzoDxl4qRjUI ouWK+qESjcCcJRpgwbE+j4FY8cYQxZXmSf/t3t2sdDHoqFjwY/5Ucp3qIgFFgNAwNS6e ttZ4Y/Y041latFqYcvj5zq1oDIISju8Z7FjaERojtbVldrs/TLlgG/Ma6bOqfeRjQLLH nZQTZbTYVhBmyncePjHa7LgInBm/PCinzJ8oP0ioObTBalz9ouw8rHkprMxOrJZPn7XC bE4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679080435; 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=Toyfbf+SoovM/Ffd1wohbkyOgiucLUqCVM5bj6+KSwQ=; b=Y9UPlmP38mSAYAUdP9Ga5HjjILU/qkVjQIw8v1diBm3WrLNVEwXWS6dZY/SO1CQkW8 K+OZHgXAUn6UfXu1uET68eR3HA2xdg6lxOberidbTZJ3GsGB91iZ0J47C5+B/VMlxfiq PaRQEF+GTRMCExGv778jPqMJ4om3eRs9/EPPqm0h5PZ/tEG+QdQgUIj442Y+Tc1VxNK5 sfE35Fb0keMeAhkRuZ21T+ymbHvYtDK+WU6ZqgQn52S16lTpZ6TtMF51d+LgArLpuBoM lgIxfeoJ8aJg8LDdXPPILdGsrLS0ai4tESFw6Ofn3Fc6al3iUnsLbjhZ9qPbyYIGlECo hanA== X-Gm-Message-State: AO0yUKU2NEZkYI0uz3o/fWUIu0ubK/Oei//sK/YsN/us0YJrdSUg0Glj +AC4d8q5WGrIKi31yqGNha4n3NYkTQg= X-Received: by 2002:a17:906:7399:b0:92b:dd20:16f5 with SMTP id f25-20020a170906739900b0092bdd2016f5mr7994154ejl.7.1679080434958; Fri, 17 Mar 2023 12:13:54 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id k8-20020a17090627c800b008d1693c212csm1273935ejc.8.2023.03.17.12.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 12:13:54 -0700 (PDT) Date: Fri, 17 Mar 2023 20:13:52 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/9] staging: rtl8192e: Replace macro container_of_work_rsl with standard f. Message-ID: <58fa53b80fd866f2057d236f78144dda34d6f263.1679077522.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760643964461021693?= X-GMAIL-MSGID: =?utf-8?q?1760643964461021693?= Replace macro container_of_work_rsl with standard function container_of to increase readability. Signed-off-by: Philipp Hortmann --- 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_parameters = { static void _rtl92e_update_beacon(void *data) { - struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, - update_beacon_wq.work); + struct r8192_priv *priv = container_of(data, struct r8192_priv, update_beacon_wq.work); struct net_device *dev = priv->rtllib->dev; struct rtllib_device *ieee = priv->rtllib; struct rtllib_network *net = &ieee->current_network; @@ -326,8 +325,7 @@ static void _rtl92e_update_beacon(void *data) static void _rtl92e_qos_activate(void *data) { - struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, - qos_activate); + struct r8192_priv *priv = container_of(data, struct r8192_priv, qos_activate); struct net_device *dev = priv->rtllib->dev; int i; @@ -2033,8 +2031,7 @@ void rtl92e_commit(struct net_device *dev) static void _rtl92e_restart(void *data) { - struct r8192_priv *priv = container_of_work_rsl(data, struct r8192_priv, - reset_wq); + struct r8192_priv *priv = container_of(data, struct r8192_priv, reset_wq); struct net_device *dev = priv->rtllib->dev; mutex_lock(&priv->wx_mutex); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/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) void rtl92e_ips_leave_wq(void *data) { - struct rtllib_device *ieee = container_of_work_rsl(data, - struct rtllib_device, ips_leave_wq); + struct rtllib_device *ieee = container_of(data, struct rtllib_device, ips_leave_wq); struct net_device *dev = ieee->dev; struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.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 -#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/rtl8192e/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_device *ieee) static void rtllib_associate_complete_wq(void *data) { struct rtllib_device *ieee = (struct rtllib_device *) - container_of_work_rsl(data, + container_of(data, struct rtllib_device, associate_complete_wq); struct rt_pwr_save_ctrl *psc = &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); void rtllib_wx_sync_scan_wq(void *data) { - struct rtllib_device *ieee = container_of_work_rsl(data, - struct rtllib_device, wx_sync_scan_wq); + struct rtllib_device *ieee = container_of(data, struct rtllib_device, wx_sync_scan_wq); short chan; enum ht_extchnl_offset chan_offset = 0; enum ht_channel_width bandwidth = 0; From patchwork Fri Mar 17 19:13:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 71410 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp528872wrt; Fri, 17 Mar 2023 12:48:32 -0700 (PDT) X-Google-Smtp-Source: AK7set+WJ/RAGAJEvWQgoiSUFqNRAOzltyezev+W3f3rhTG3j3a63/zpGswv/2Da7PEPlWsptg5X X-Received: by 2002:a17:902:b682:b0:19c:13d2:44c5 with SMTP id c2-20020a170902b68200b0019c13d244c5mr8671595pls.3.1679082512611; Fri, 17 Mar 2023 12:48:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679082512; cv=none; d=google.com; s=arc-20160816; b=DGRy79UIQ5NNUvecSQVPndcUwn5DdZDe5qPx3abFUUjYYDZrQ+6vSqc5lv3cViVvlI 8TDb1/HHU75xgQyJ5BdxEdirqTNeHv0WemEyE9xTG8krDWkFmnW2PgpzpEfEisDdwlVV pEucJMD+0tl704z7ISNvE/bg3P3SV6gAIh1BhI+9THQRaAmSXhM0VvWJwpBWDynxL1jX or0wo3xxKR+f89E8hIqRAv3aQ3evx63UV7rokixAjfjUqZTUCyzbLE0yghQeo5MEh1Ao IImLhG0mboYc9FDrYh8GoV7Z10d+4BciJlJ/RymYFZcjhCRxxBXlGSUXhQnMnfDMtaok Opdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=zMLQ0SN7sIsh/JIte5hM0vfAsuLvo6gietIEQs9gOFU=; b=kCV4da10lx+3njkEmSH7iwvNj9/HHSZVyWS4zc7YsArOgbOf5nxfMg/8QiApfnT5LM TR7vnJldILcL+wZoMDUwjjbqCYQeiBdD7i24BqsKIf8JNie4f0e/wT7woAuxzN9juMF4 wC0ligDaCk3Tnb/u3VX0PU36poVmzaJrhKesJob3ASfTIZz/9wwVBTwVtL5aZoBXDjDJ Kz2ngIdEW5giAXIUBZ1CEs+863egF9PLCut3RdS+ocugmWwPiK6sRZe8oEkyRGURKEVo sRpDLTAhdcf4jaDgYCDwz/IfYaon/+t7wyrE0DxP8eXPppM7scO7rOiUxlHpkPQnIUJE zVrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="OZOgP/+C"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j11-20020a170902da8b00b001a179347c13si3631071plx.552.2023.03.17.12.48.18; Fri, 17 Mar 2023 12:48:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="OZOgP/+C"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230018AbjCQTOi (ORCPT + 99 others); Fri, 17 Mar 2023 15:14:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230246AbjCQTOa (ORCPT ); Fri, 17 Mar 2023 15:14:30 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24211E41F9 for ; Fri, 17 Mar 2023 12:14:04 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id z21so24304265edb.4 for ; Fri, 17 Mar 2023 12:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679080442; x=1681672442; 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=zMLQ0SN7sIsh/JIte5hM0vfAsuLvo6gietIEQs9gOFU=; b=OZOgP/+Cvhi+vHyNjHTbDxAkYajhYcjB19aGGIqpKS1bUJJlumsURP8Juix2wf2n3h l1U6A87+cHfwAr67bIcfPObj7t39ZUVTQ0FyEPEfVr573drLmuGsNZQ5+71EsiIgMaOB Cx/R9CV2ZnTr13OeFN5JiPUcFW+lVNLn7qjKB6BFtCZmC4zYxOoCGJ8/Cu5079yHgERp CxQYDaRz7ts/iKT1Tog0mgAuXWDbWzkNUuU0S1QBQGtSanazo23X4LgdK8YjsWd77eGW sTj6YjQwSMX5j+YyV+6lWogs5oIfzwE2jQR5glJkLHgl4MFMmNYCrCBKWdvGdoYr5pge ZzZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679080442; x=1681672442; 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=zMLQ0SN7sIsh/JIte5hM0vfAsuLvo6gietIEQs9gOFU=; b=GEHmq1/cB/+mdEmwxOxSPLn7c7SGPsAI9PLO/aA0XaI8Vg3M5Qn1ow7jZ6aUvG99hA Wvct0R80fGUuJQx5sVGu0IuMs6XjC8y5eYaO1+ZIbb0sx8LaWDzzt7gSIVpQ3F9qMp+J HRvfvXomiTqNBY2zCntaEXJG3smJ+Ac6g4KL/z/JQAmfBO+1MxE1qqt+v7AyhlRZRrWU DItQVUjf9dyArzrg5h7EJtC5jL9zGXb2afdvZGGwG4Xn/+vu+gkGnPnSRcExKyhZFGki RHwtOJERywIoGzCj4eUxgeA/JAuk3tJ8mehdv9Y+9qTe43tvMeFnOtZMbAHrCQWlswBZ P9vA== X-Gm-Message-State: AO0yUKWS2tfHMaUNhjtgxmK9+x0uPEb0j7h/3mW5b5Y2d6hyCZOrz2u/ Lxgt9nu8Bqfj2qcSZBNb5oM= X-Received: by 2002:a17:906:10d7:b0:930:aa02:f9cf with SMTP id v23-20020a17090610d700b00930aa02f9cfmr5419945ejv.2.1679080442097; Fri, 17 Mar 2023 12:14:02 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id u4-20020a17090626c400b00924916f9c21sm1276025ejc.87.2023.03.17.12.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 12:14:01 -0700 (PDT) Date: Fri, 17 Mar 2023 20:13:59 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 8/9] staging: rtl8192e: Replace macro iwe_stream_add_event_rsl with standard f. Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760645624592812143?= X-GMAIL-MSGID: =?utf-8?q?1760645624592812143?= Replace macro iwe_stream_add_event_rsl with standard function iwe_stream_add_event to increase readability. Signed-off-by: Philipp Hortmann --- 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/rtllib.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) -#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) diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/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 = SIOCGIWAP; iwe.u.ap_addr.sa_family = ARPHRD_ETHER; ether_addr_copy(iwe.u.ap_addr.sa_data, network->bssid); - start = iwe_stream_add_event_rsl(info, start, stop, - &iwe, IW_EV_ADDR_LEN); + start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN); /* Remaining entries will be displayed in the order we provide them */ /* Add the ESSID */ @@ -71,8 +70,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, } *pname = '\0'; snprintf(iwe.u.name, IFNAMSIZ, "IEEE802.11%s", proto_name); - start = iwe_stream_add_event_rsl(info, start, stop, - &iwe, IW_EV_CHAR_LEN); + start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN); /* Add mode */ iwe.cmd = SIOCGIWMODE; if (network->capability & @@ -81,8 +79,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.u.mode = IW_MODE_MASTER; else iwe.u.mode = IW_MODE_ADHOC; - start = iwe_stream_add_event_rsl(info, start, stop, - &iwe, IW_EV_UINT_LEN); + start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_UINT_LEN); } /* Add frequency/channel */ @@ -90,8 +87,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.u.freq.m = network->channel; iwe.u.freq.e = 0; iwe.u.freq.i = 0; - start = iwe_stream_add_event_rsl(info, start, stop, &iwe, - IW_EV_FREQ_LEN); + start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_FREQ_LEN); /* Add encryption capability */ iwe.cmd = SIOCGIWENCODE; @@ -152,7 +148,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.u.bitrate.disabled = 0; iwe.u.bitrate.fixed = 0; iwe.u.bitrate.value = max_rate * 500000; - start = iwe_stream_add_event_rsl(info, start, stop, &iwe, IW_EV_PARAM_LEN); + start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_PARAM_LEN); iwe.cmd = IWEVCUSTOM; iwe.u.data.length = p - custom; if (iwe.u.data.length) @@ -172,7 +168,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, if (!(network->stats.mask & RTLLIB_STATMASK_SIGNAL)) iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID; iwe.u.qual.updated = 7; - start = iwe_stream_add_event_rsl(info, start, stop, &iwe, IW_EV_QUAL_LEN); + start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN); iwe.cmd = IWEVCUSTOM; p = custom; From patchwork Fri Mar 17 19:14:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 71409 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp522549wrt; Fri, 17 Mar 2023 12:31:43 -0700 (PDT) X-Google-Smtp-Source: AK7set9to4THNaOh64ZguAMyTdzw3LtmYRnKhVj7mbKx86ERBHNaIHexYSjwf7uRS8SLQD5vFd0a X-Received: by 2002:a05:6a21:32a1:b0:c7:af88:4199 with SMTP id yt33-20020a056a2132a100b000c7af884199mr10404551pzb.6.1679081503002; Fri, 17 Mar 2023 12:31:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679081502; cv=none; d=google.com; s=arc-20160816; b=X8iL2c+hxXO5A40j8pNBj471uI7kx3c+GxbBSvvSR0vsWBXakekI8ymOktqjI6I3sh Fj+F9Ums5p4YW5kPRTOa7t6yYtF3o09z1FqVmGwT8mZaSdrG9Z8iXqZJ/6joPqM3xhTi 7LF9H5KhtYcvEBosxYnZ4p0IJ2NWmXemJbLUbV+JzZwi//6Fid7XY2RCu2w3FdPxRpM5 8zTK1EZfuY9jwJoDiObVx/V8CLmeaEnzKydwXc6Rg8JRamtTVJnUUlxiFMnf8kvyaBgT RhYm25Dimskkgc9FDTAXJy1ysMqh/J3qT/LuNhwHQ9abnhYJB9uy0oMahhZw2l18HAxr jQCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=50FdVkozqmiDaTptaXm+T/SPqTjp6PSR0BLk57qblb0=; b=m45zhCkw/eRsuxe72g/R3JUGDkY+UsMaWjCckwY3+XlfBX3eZhiM4n/wfo4/CREN3L hTjomYjUSHoSNopPt/7uasSud+iqEIQwM7aZvEWve1npLR/GfdohrnNC7g9qu40QLqtA woVwhI3W+Ev8uLaAYtjSx3Q9y/3poNH+/54P0Fvi88SEYi1VfeaJGGWamqTgr53rjKrO hlfVaWwniG7rNxgCfwUgNXVc7xCfBNKd/DPFn/M0cYfdTA8C7Ek7B56rNr7oxJfoSHAT SbIQryPTlN8k42+ASP4EkAiMKN7Zkisnh7gC7eurAsXIYrRcWD+kq5CI42McbE+++zEB vxKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=T1t8o5Uj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b1-20020a656681000000b004fb6f10cd3asi3226633pgw.871.2023.03.17.12.31.27; Fri, 17 Mar 2023 12:31:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=T1t8o5Uj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229823AbjCQTOr (ORCPT + 99 others); Fri, 17 Mar 2023 15:14:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230227AbjCQTOk (ORCPT ); Fri, 17 Mar 2023 15:14:40 -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 3256CE251C for ; Fri, 17 Mar 2023 12:14:15 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id ek18so24261680edb.6 for ; Fri, 17 Mar 2023 12:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679080450; x=1681672450; 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=50FdVkozqmiDaTptaXm+T/SPqTjp6PSR0BLk57qblb0=; b=T1t8o5Uj+OFyo+FA4xqSAahdXZ2IP+1B/1wJY4yKIP+XmwhwnBbbLhBZYw7DuSW9cI zFB4+oqwbLw4PM6SiEv2wHLKTkeOcLnoGelmGaZytPMWUVRouI0UbqtamdPSACSBYCst CGqEmVx7OSI4H6Q52dE0nFTtpOUONGdbbMBGwsBVDN07TVSsW9G3OI9LscTNCRdK9AYg x1IeTdKJBt4pJN0QqSLx2NngKkUwNaA1jli7l1pKoP7Iok2Ay9AU1ftOQttHng2aGnbT ILVDAmJ1q/y6zw0iTneNp4Bj7IvWbdXFJ8dsP2J/QcL+QJ6tz3baC4uKBs6pOIG/FjT5 EJEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679080450; x=1681672450; 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=50FdVkozqmiDaTptaXm+T/SPqTjp6PSR0BLk57qblb0=; b=5io3D0WyuN8q/H+Ks9KMzbW7hkhq3SdgvdtQqhKp9LWs59vVYNYFrw0BHyRDG0AfxQ 9GGMzOmrPhwqglkwqLUmZkWYooXYeKuwFLCZVytnhkm8WZU2SEF/cPTzI2kupIEFp1C0 9g54xq256kKWUsoSiELOhD3xzvUiW3ZvyjMtLaiZc3KpMF82AyLGY4ASmAZXTWg/SmLJ byd3zFBb0FrXJx+XfMaWXO5DhEuBOv9qupfyJ2kl62FbwITXvFxLOOhtMq6lSz+ZWmQs IHTtwDeJqfeNLaYJ1GyMHtJdwozmEd+TY9iy5cbexdfJu4czlV8c9ZubhkxQfwmUtA4J zxww== X-Gm-Message-State: AO0yUKXkBFhQI6CmwrR0DGjgTyMOsqLr5Rw0HLOPYUZ7vVIb87S/sgmC sBW60IYGXSCeAxe6BZ4Ruek= X-Received: by 2002:a17:906:5354:b0:87c:c1:111 with SMTP id j20-20020a170906535400b0087c00c10111mr6508829ejo.4.1679080450598; Fri, 17 Mar 2023 12:14:10 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id v17-20020a170906339100b008e724dfc44bsm1282753eja.78.2023.03.17.12.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 12:14:10 -0700 (PDT) Date: Fri, 17 Mar 2023 20:14:08 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 9/9] staging: rtl8192e: Replace macro iwe_stream_add_point_rsl with standard f. Message-ID: <27877d851c5afc5c226e68ebf4724c8f58486d68.1679077522.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760644565800799451?= X-GMAIL-MSGID: =?utf-8?q?1760644565800799451?= Replace macro iwe_stream_add_point_rsl with standard function iwe_stream_add_point to increase readability. Signed-off-by: Philipp Hortmann --- 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/rtllib.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) -#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/rtl8192e/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 rtllib_device *ieee, iwe.u.data.flags = 1; if (network->ssid_len > 0) { iwe.u.data.length = min_t(u8, network->ssid_len, 32); - start = iwe_stream_add_point_rsl(info, start, stop, &iwe, - network->ssid); + start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid); } else if (network->hidden_ssid_len == 0) { iwe.u.data.length = sizeof(""); - start = iwe_stream_add_point_rsl(info, start, stop, - &iwe, ""); + start = iwe_stream_add_point(info, start, stop, &iwe, ""); } else { iwe.u.data.length = min_t(u8, network->hidden_ssid_len, 32); - start = iwe_stream_add_point_rsl(info, start, stop, &iwe, - network->hidden_ssid); + start = iwe_stream_add_point(info, start, stop, &iwe, network->hidden_ssid); } /* Add the protocol name */ iwe.cmd = SIOCGIWNAME; @@ -96,8 +93,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, else iwe.u.data.flags = IW_ENCODE_DISABLED; iwe.u.data.length = 0; - start = iwe_stream_add_point_rsl(info, start, stop, - &iwe, network->ssid); + start = iwe_stream_add_point(info, start, stop, &iwe, network->ssid); /* Add basic and extended rates */ max_rate = 0; p = custom; @@ -152,8 +148,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, iwe.cmd = IWEVCUSTOM; iwe.u.data.length = p - custom; if (iwe.u.data.length) - start = iwe_stream_add_point_rsl(info, start, stop, - &iwe, custom); + start = iwe_stream_add_point(info, start, stop, &iwe, custom); /* Add quality statistics */ /* TODO: Fix these values... */ iwe.cmd = IWEVQUAL; @@ -174,7 +169,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, p = custom; iwe.u.data.length = p - custom; if (iwe.u.data.length) - start = iwe_stream_add_point_rsl(info, start, stop, &iwe, custom); + start = iwe_stream_add_point(info, start, stop, &iwe, custom); memset(&iwe, 0, sizeof(iwe)); if (network->wpa_ie_len) { @@ -183,7 +178,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, memcpy(buf, network->wpa_ie, network->wpa_ie_len); iwe.cmd = IWEVGENIE; iwe.u.data.length = network->wpa_ie_len; - start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf); + start = 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 rtllib_device *ieee, memcpy(buf, network->rsn_ie, network->rsn_ie_len); iwe.cmd = IWEVGENIE; iwe.u.data.length = network->rsn_ie_len; - start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf); + start = iwe_stream_add_point(info, start, stop, &iwe, buf); } /* add info for WZC */ @@ -203,7 +198,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, memcpy(buf, network->wzc_ie, network->wzc_ie_len); iwe.cmd = IWEVGENIE; iwe.u.data.length = network->wzc_ie_len; - start = iwe_stream_add_point_rsl(info, start, stop, &iwe, buf); + start = iwe_stream_add_point(info, start, stop, &iwe, buf); } /* Add EXTRA: Age to display seconds since last beacon/probe response @@ -216,8 +211,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, (100 * (jiffies - network->last_scanned)) / HZ); iwe.u.data.length = p - custom; if (iwe.u.data.length) - start = iwe_stream_add_point_rsl(info, start, stop, - &iwe, custom); + start = iwe_stream_add_point(info, start, stop, &iwe, custom); return start; }