From nobody Tue Apr 14 12:25:06 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 191C7C61DA4 for ; Thu, 23 Feb 2023 06:47:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233426AbjBWGr3 (ORCPT ); Thu, 23 Feb 2023 01:47:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233417AbjBWGr1 (ORCPT ); Thu, 23 Feb 2023 01:47:27 -0500 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 581484AFD2 for ; Wed, 22 Feb 2023 22:47:25 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id h16so39095714edz.10 for ; Wed, 22 Feb 2023 22:47:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677134844; 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=u4jucbORZ+OZR8pDS3QMC3YnlP5eW/j0vhDGVkYwBMg=; b=mOyCavMhBDV9ktxq0ihr3nMvVRXYEwbcgd7mHrheqcejTJuhS9d9saed1e5qorfmAX CgsfjvT+NjoT6T3xkU97FRzsGbzvYdOhBJsq8b19im+yxc0teuUtMYuUplsq1+zc4deZ R6cHN60ZGIRVk3VN4sV09qkwA2MdUkCCAiuaLU26PQuSIe8D8pEbqBDzY9mJdhF14EpY in10GwO0VpOUQG+PN/FybJ1npmiQChsW8/82kCUYGSg5rAttc9uF5Yh6PikeMIugHcKX afEyKDNgiAHyGOxFNSCvy+fecEptsyAwSuTcXMFjpePFeVAIQQLUeImSlG75/rnnMbUi qHlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677134844; 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=u4jucbORZ+OZR8pDS3QMC3YnlP5eW/j0vhDGVkYwBMg=; b=0WxYslc+F2Y0YlM0rXbVPhIRcYxbbl+d+TzMM7ha1gGXzdkn6QlNF1Etu37cNF7ui7 jkpJXcdbY8A3/qwwpXsCXlNy35ItCyK3NKubKQl6G3K7ZRFa/EDwpHFo4LPr+2wZfyvd QPiY2GE5t2w+m94DfB/Y3kEWDPTz0g0hQYW/hduEuCqbjOWbxdbSYMt/pfzod4jjVVuG krVowccvOTfMoktT7HWc9WAekvFmc56cQHs5sJL+nzM6m6TnisRP17TbEvKzHmunlr8+ 6byJmm3gy0w9OglD8drYEIz62fFX0RGjxhtDwWqCMRKRfwCMdCoZ+98E43m+YbWNvytH Bphw== X-Gm-Message-State: AO0yUKXgj1l71w5zieWi4VmvjJ263cJKFBTcprwpuAPkoedMVokVyX6B GFckqAEI1ZCGy1oHRmcPt0w= X-Google-Smtp-Source: AK7set+Gf870jQFuMUaGV3IHvHCyeLL7S+D6Rm9PqbiQPJvOXR5/Ba+wsr9YcXQ+itwqXBgDJsGAvQ== X-Received: by 2002:a17:906:73d2:b0:87c:c1:111 with SMTP id n18-20020a17090673d200b0087c00c10111mr14654512ejl.4.1677134843927; Wed, 22 Feb 2023 22:47:23 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id p12-20020a1709060dcc00b008c1f68ba0e2sm6435870eji.85.2023.02.22.22.47.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 22:47:23 -0800 (PST) Date: Thu, 23 Feb 2023 07:47:21 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] staging: rtl8192e: Replace macro RTL_PCI_DEVICE with PCI_DEVICE Message-ID: <8b45ee783fa91196b7c9d6fc840a189496afd2f4.1677133271.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 RTL_PCI_DEVICE with PCI_DEVICE to get rid of rtl819xp_ops which is empty. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 044cab649ff1..f5a155d1a81a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -29,9 +29,9 @@ static const struct rtl819x_ops rtl819xp_ops =3D { }; =20 static struct pci_device_id rtl8192_pci_id_tbl[] =3D { - {RTL_PCI_DEVICE(0x10ec, 0x8192, rtl819xp_ops)}, - {RTL_PCI_DEVICE(0x07aa, 0x0044, rtl819xp_ops)}, - {RTL_PCI_DEVICE(0x07aa, 0x0047, rtl819xp_ops)}, + {PCI_DEVICE(0x10ec, 0x8192)}, + {PCI_DEVICE(0x07aa, 0x0044)}, + {PCI_DEVICE(0x07aa, 0x0047)}, {} }; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index f75cc96052d9..c2a4b2ae6a81 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -55,11 +55,6 @@ #define IS_HARDWARE_TYPE_8192SE(_priv) \ (((struct r8192_priv *)rtllib_priv(dev))->card_8192 =3D=3D NIC_8192SE) =20 -#define RTL_PCI_DEVICE(vend, dev, cfg) \ - .vendor =3D (vend), .device =3D (dev), \ - .subvendor =3D PCI_ANY_ID, .subdevice =3D PCI_ANY_ID, \ - .driver_data =3D (kernel_ulong_t)&(cfg) - #define TOTAL_CAM_ENTRY 32 #define CAM_CONTENT_COUNT 8 =20 --=20 2.39.2 From nobody Tue Apr 14 12:25:06 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 7945BC636D7 for ; Thu, 23 Feb 2023 06:47:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233427AbjBWGri (ORCPT ); Thu, 23 Feb 2023 01:47:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232056AbjBWGrg (ORCPT ); Thu, 23 Feb 2023 01:47:36 -0500 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 1A1C54BE86 for ; Wed, 22 Feb 2023 22:47:32 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id f13so38392555edz.6 for ; Wed, 22 Feb 2023 22:47:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677134850; 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=6CjMSX3fCv/Qr1M0aeSG/e+l/GblnDne7N25TnEl9vI=; b=MAwUCEBEIh7x0Lr0V2oLN8HKK9Nn5ZwZbIFA//ovhuOIgajx6fkWg56JTkjQrQbr9t L/WXYNqVV2McAS71EAQB3Oo63SZOXkxPMEZTnDRn1kjmtCytieBTNbkYu7RwpXp2A7Vs TaDYpPzcRqwaCxu47TH/JDCV+SwjIc7PGhyJPFPNHb2FBTEH8ASwhJyY+mQsOGW6G7lr YSkm4xBhXb/W9eGRCH41G14c2QaQ8nmPlypW7Wnwu2GQzk9K2DMVpV6U5P5HK5iDPK0c +8lQwbpLbxcBUEmXnmbkb1QHbPp2kyBnUqZpWt5CNRoNdasziBejSfiGYIvHIPhBnn0X 4rFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677134850; 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=6CjMSX3fCv/Qr1M0aeSG/e+l/GblnDne7N25TnEl9vI=; b=xAH0lUKYyeoFHe7yS3vEgUzqQwtLqiMW2h49msnT+CEY2oJolFUQkQDOUh+Fgx8ZgC kmevn59Bit4pdiTVh2aNesz0LhKDSU8OHLHu6NMCvL9KpkEI5kA+5T+8To/bZUsMx4sd cFPPS/HSjpJ82NuGB2Xcb05C5dyAk3qP8rPbbvRbqRSMv9i2o9ngfvq3PEA0cNMlgakI d2olE/VzvPPfRVThguenU2TiVAXFX0lv2BKy8LGZogR33lH0sNKGJpt9pjfcqJucyF4Q rae8y4Np8dt/SQIm36xlHwNX0gFe9K0XkCr/TU4EWNY0z5Cl7ZTvjZj49W4ulJOeGr+D bSmg== X-Gm-Message-State: AO0yUKV8hsGSOzQDsgVTwFNNCHEijtECVCXaldAvWh0B+Dn2cn9kNvA5 86sq/NuGeJ/R7pd/bD0hzuM= X-Google-Smtp-Source: AK7set89d0/XCAaY6TDRJ0GNgheYEinTgayLhXErICIVlYtWFn5N4+TqzuXiuKgyZjytwk16GCoecg== X-Received: by 2002:a05:6402:1e8e:b0:4ad:de7:253f with SMTP id f14-20020a0564021e8e00b004ad0de7253fmr11531165edf.3.1677134850536; Wed, 22 Feb 2023 22:47:30 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id h21-20020a50cdd5000000b004af5968cb3bsm2614654edj.17.2023.02.22.22.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 22:47:29 -0800 (PST) Date: Thu, 23 Feb 2023 07:47:28 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] staging: rtl8192e: Remove empty struct rtl819x_ops Message-ID: <31b5b0ba88d7b07b0407956d56446e8f0e62e3e7.1677133271.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 empty struct rtl819x_ops as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 ------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ---- 2 files changed, 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index f5a155d1a81a..718d69b4ce16 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -25,9 +25,6 @@ int hwwep =3D 1; static char *ifname =3D "wlan%d"; =20 -static const struct rtl819x_ops rtl819xp_ops =3D { -}; - static struct pci_device_id rtl8192_pci_id_tbl[] =3D { {PCI_DEVICE(0x10ec, 0x8192)}, {PCI_DEVICE(0x07aa, 0x0044)}, @@ -2190,7 +2187,6 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev, unsigned long ioaddr =3D 0; struct net_device *dev =3D NULL; struct r8192_priv *priv =3D NULL; - struct rtl819x_ops *ops =3D (struct rtl819x_ops *)(id->driver_data); unsigned long pmem_start, pmem_len, pmem_flags; int err =3D -ENOMEM; u8 revision_id; @@ -2257,8 +2253,6 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev, if (pdev->device =3D=3D 0x8192 && revision_id =3D=3D 0x10) goto err_unmap; =20 - priv->ops =3D ops; - if (!rtl92e_check_adapter(pdev, dev)) goto err_unmap; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index c2a4b2ae6a81..c8816c44ca51 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -198,9 +198,6 @@ struct rtl8192_tx_ring { struct sk_buff_head queue; }; =20 -struct rtl819x_ops { -}; - struct r8192_priv { struct pci_dev *pdev; struct pci_dev *bridge_pdev; @@ -218,7 +215,6 @@ struct r8192_priv { struct delayed_work txpower_tracking_wq; struct delayed_work rfpath_check_wq; struct delayed_work gpio_change_rf_wq; - struct rtl819x_ops *ops; struct rtllib_device *rtllib; =20 struct work_struct reset_wq; --=20 2.39.2