From patchwork Sun Mar 5 22:33:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 64375 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1568651wrd; Sun, 5 Mar 2023 15:18:16 -0800 (PST) X-Google-Smtp-Source: AK7set/KColhEqpQo8zBEIEUbGlJ8Af4NCIcl89QGdn/bSybHlkP/AjKXszOLNxG4B86l9GALLWO X-Received: by 2002:a05:6a20:918a:b0:cc:6e9b:c69b with SMTP id v10-20020a056a20918a00b000cc6e9bc69bmr9895813pzd.55.1678058296636; Sun, 05 Mar 2023 15:18:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678058296; cv=none; d=google.com; s=arc-20160816; b=JMF1irVwCXhJDxx5DZXbom4YIEG00rw4d+b67MhfDJ01Io0v1c644oPpCptEkidwQi Q6kxP69xrPzic4Pg+I40fw7SVOMxRoMrn5W8I05LQK2v+V/1l2Cedhmrqm64BABle/i9 YK7VU3HhWRVYQW2QTfDnM9TefupOej/ZhtqhGXlRSKN+kdyxP+5ZWiI1WwVz2qd4TF8s ENVjVqLZs9M4OBETxoDMUlEnZP6Q2oZpy8wjl2AZPLwEzdEgc9xnJH2x0Vdyybr6AMZt b51Bpa4ZbPnb9t+5+/k4ZvACqMLEc4pooFFcB6uKS5FnJMQqXo4hBt+FtO4XnlorznRf OjRQ== 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=WP9Y1Qp/ynuiCDbnGI065WOW+LZSB7xSPmQ2TQrQ8rM=; b=jKlGvtmnMYW1nBjFDw5rBviPE+9mDj8Z8LZb3rC4p6gujzNiFqOg2ZUSAoMFElOJZa NJE6SROUczOukcX0RAEMXpK0M78GI/3Y6yCk9wkTg3QTqR63CIMSwCaQv+mlaOsOwQv1 lGpy+S31Mac4uT1NW7pTB347+7NttLX2bRMSW2X/sCxC6k2dLL+JVvOaAr4aqsWgjPES 8x2rZ1vI359LivrPvtrXqL6KpCRB/YpJbomq3x7AqWbvquK5hM9vLiLOfxe9TRgY0y/3 Xu1BQlr3ms5BDvl6WeTO8tOUEt2kAeudgYiVQEz/MSJ4zbjHPuJh42vaMnnoO11xqmMM l0aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZTtLSCTN; 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 y127-20020a633285000000b004fb7d5d316esi7862742pgy.404.2023.03.05.15.18.00; Sun, 05 Mar 2023 15:18:16 -0800 (PST) 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=ZTtLSCTN; 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 S229738AbjCEWdP (ORCPT + 99 others); Sun, 5 Mar 2023 17:33:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229740AbjCEWdO (ORCPT ); Sun, 5 Mar 2023 17:33:14 -0500 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 48641F3 for ; Sun, 5 Mar 2023 14:33:09 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id s11so31314877edy.8 for ; Sun, 05 Mar 2023 14:33:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678055588; 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=WP9Y1Qp/ynuiCDbnGI065WOW+LZSB7xSPmQ2TQrQ8rM=; b=ZTtLSCTNJ4lJ2R4/LQC9kx8pMcZemEjVWin6foSdB3IaaAKKNhSk8vqmTeODaPz1wg OxZF05sXAf8rs+UMeCXhC+Wbhz0GXOktc52v+8ScAgQuyM1DxTTInR9QSlXCgQL67CtO m1B4HjeOAu6ooLRteBrgfQiu1YF0FNMbF+/iPut/jFw9fwHHvrrCm8tW1fy0uocz/761 8DO/ZKfc3BNP/NIwqXg3zD4Ej9WFVCPAhxUSShIUYyYs197wD8ioIyM+HYsQIKb0nsSh DZO2lsEFtpKg9RwCHAxlQ+BvlDxP47Q/hJ1bBLMozQK/+cHfFiHWVzPRJE1VRAbJ0ubi EJgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678055588; 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=WP9Y1Qp/ynuiCDbnGI065WOW+LZSB7xSPmQ2TQrQ8rM=; b=GlkwAd5QQAExJZyojHcr9Qjm+7EYWaMulbGV8jcF5PsS+MtEzNMNArni+VOt5Lsx9f CjEFoIkof+/Pv5EDtKRYcqRP0pL0xtKCMHUYosX5HRX3XEXjdmkwSmAdKTGOF0jFrbI0 h6oUoJ/EMwgVM/RcAEdldTiSgq2tlUQKUGD1ZxOe64SaiB9sxIf3iueNlet9PGABFo9E tpscim+hqRItU4qoRYz8tgNTK6WZGQy0hiZZrLagP5Kq55I+1U9WEAra4emoXc7TyAwR XRWH5o6gQLmA7OFy9kjjRaFIAgokIyS3yyakWK41j9mdUbs1/pv7nFP9vOBLjrQWbC/n 2h1g== X-Gm-Message-State: AO0yUKVl1oNzIpVOz6WAIk3YzfK6jJIRywCKEs449vUGYUu7pVUrzrym gBA6TXObtnGwtT6R9kdKo5Lony6kLuQ= X-Received: by 2002:a17:906:1043:b0:878:4bda:2011 with SMTP id j3-20020a170906104300b008784bda2011mr8178867ejj.4.1678055587705; Sun, 05 Mar 2023 14:33:07 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id k17-20020a170906a39100b008b17fe9ac6csm3753348ejz.178.2023.03.05.14.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 14:33:07 -0800 (PST) Date: Sun, 5 Mar 2023 23:33:05 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] staging: rtl8192e: Remove empty Array Rtl8192PciERadioC_Array 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?1759571656147647867?= X-GMAIL-MSGID: =?utf-8?q?1759571656147647867?= Remove empty array Rtl8192PciERadioC_Array and the code where it is used because it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 12 ------------ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 -- drivers/staging/rtl8192e/rtl8192e/table.c | 3 --- drivers/staging/rtl8192e/rtl8192e/table.h | 2 -- 4 files changed, 19 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 35ca01ab65ff..fe0ef52c163a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -649,18 +649,6 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) bMask12Bits, Rtl819XRadioB_Array[i+1]); - } - break; - case RF90_PATH_C: - for (i = 0; i < RadioC_ArrayLength; i += 2) { - if (Rtl819XRadioC_Array[i] == 0xfe) { - msleep(100); - continue; - } - rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioC_Array[i], - bMask12Bits, - Rtl819XRadioC_Array[i+1]); - } break; case RF90_PATH_D: diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h index 561a4c874fe3..6772ed300591 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -14,7 +14,6 @@ #define RadioA_ArrayLength RadioA_ArrayLengthPciE #define RadioB_ArrayLength RadioB_ArrayLengthPciE #define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE -#define RadioC_ArrayLength RadioC_ArrayLengthPciE #define RadioD_ArrayLength RadioD_ArrayLengthPciE #define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE @@ -22,7 +21,6 @@ #define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array #define Rtl819XRadioA_Array Rtl8192PciERadioA_Array #define Rtl819XRadioB_Array Rtl8192PciERadioB_Array -#define Rtl819XRadioC_Array Rtl8192PciERadioC_Array #define Rtl819XRadioD_Array Rtl8192PciERadioD_Array #define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array #define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rtl8192e/rtl8192e/table.c index d04608d99cbf..4e97ad4b8fd7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -325,9 +325,6 @@ u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] = { 0x007, 0x00000700, }; -u32 Rtl8192PciERadioC_Array[RadioC_ArrayLengthPciE] = { - 0x0, }; - u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE] = { 0x0, }; diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/rtl8192e/table.h index 177fe2173430..981e8b57d3de 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -17,8 +17,6 @@ extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE]; extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE]; #define RadioB_ArrayLengthPciE 78 extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE]; -#define RadioC_ArrayLengthPciE 2 -extern u32 Rtl8192PciERadioC_Array[RadioC_ArrayLengthPciE]; #define RadioD_ArrayLengthPciE 2 extern u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE]; #define MACPHY_ArrayLengthPciE 18 From patchwork Sun Mar 5 22:33:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 64377 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1569820wrd; Sun, 5 Mar 2023 15:23:11 -0800 (PST) X-Google-Smtp-Source: AK7set/6TOA3jot73dHKDKLadUWomwoILHTx0jLa2AHicf6/v1mGZC8smaVSTI96yUHqNIClbhVN X-Received: by 2002:a05:6a20:3c90:b0:cb:98e5:de2c with SMTP id b16-20020a056a203c9000b000cb98e5de2cmr10726310pzj.8.1678058590887; Sun, 05 Mar 2023 15:23:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678058590; cv=none; d=google.com; s=arc-20160816; b=ViWdH2XJD34C4FYbwan9qy/7oNTOy4AHlIUGQxem+GEJu7QESPnxR2whOyzFIrBsSV ZfQvU0XG5IJ8egGcfC2yoLJhYCjO5Q2CstOtbfLy2jEWhFenSKp53NF+l8gc5IOdErxT 8MpuPo0kmjZwQSRSjqi7UcR7T537S8xv+sRre8cDFbKawUZO0HzzadK8ELSlpvCW5+Dc PNvsh+y1HNS/Wq3S3Rs1Cp3JIeJIVN0LZgk393cVXLvD+jUr3Duz/yFbAH5KdEbvPd4u 7pJR/c6GRx5lbsjEYfbM8lsatlCCOYm6NZrwiv0L69kdm+l+PTWnRjp1IWz/36Pzbz3u RE9Q== 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=v+faGcyrcjggVSJi7hxIupggyB5hed7usIcPhK71OdM=; b=sLshuB32capKl0JYI63XTEYTCoGfp4osm90Bb6aQrEJWAWMrpRvkakALLXqbwDN2IX HIYGMSZcfaMP3cYy4ZPegx3qZdwbON8QYLFEm4im7T/N7MVcgeE4Vmi+Z40NiPJ6phcJ frgQEdaaDR+NBaWPgEhE17IjGfHDu+bFgqBgkrF1/soQL+vM+vT8IbGKh/Wbxs6WOllx PsoodZNbLeIicjPafDtWvWrUtTR9EQka0qajHLe9N3rAlGYW+4jHBfMwfmSJ/KoQTzx1 kTRbvZvkWviPmDAhAPP4ZWlujRTLVreUxfHSabnFdorS+nrocARIn7clcWM/mcqDVC0u RT9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=I33mrdbR; 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 y64-20020a638a43000000b004fbc985a0cesi8058632pgd.637.2023.03.05.15.22.57; Sun, 05 Mar 2023 15:23:10 -0800 (PST) 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=I33mrdbR; 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 S229755AbjCEWdY (ORCPT + 99 others); Sun, 5 Mar 2023 17:33:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229694AbjCEWdW (ORCPT ); Sun, 5 Mar 2023 17:33:22 -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 B9A0F8A6C for ; Sun, 5 Mar 2023 14:33:21 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id x3so31228903edb.10 for ; Sun, 05 Mar 2023 14:33:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678055600; 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=v+faGcyrcjggVSJi7hxIupggyB5hed7usIcPhK71OdM=; b=I33mrdbRoDE/yTqiYTUaY2x6eBs/13PiCZUxAndrAZB+YE4HL54bVw/a30JnKaDW5I NGtstuPKrROarY5efhla6aDmBTp6wYF4IaqTzds/7qxdlVyZC3autjctZdmetbGZtCqo 31cS8KDu8L4NG+Uw4+kuHOAtB9pkyH21cwv1nGs53bU7ytqt+3uOZ/Wvf5uQB1cxhvd5 svFXVlcehn155CwKL7cnMnCDrng60KDtTGJH+uaayvh7F0iwP1YOSFvv3T+MEbBVUwHz qzMAMLMdCe88ie1Ep7gG0sWl5g5rFLNUbfUv/7PBHgUrwVhLgJT4EMe2iTAamitytS74 NQRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678055600; 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=v+faGcyrcjggVSJi7hxIupggyB5hed7usIcPhK71OdM=; b=ZCXFRdPOUDv/SvukNJCSTZAejSS6MeWyYkqHm6tBAHPWLiddET9u5scN5ZdNw/+C02 tBkJxeIvqC3ELWaz6MqXjwkCJZqn4yZ5R/LZUZOWtrtga8B+oaAMLW55i5CrZe+TdSJO Zk0uSSfibHUO9BvjiWecNq9YDT6hwTt5n4lavGuR01CcpYuolZqQH8kNTUq61eRSM74X yOU6Sx3wzq2HrIMvSxXPwzxAFxWqAhEPg4jTv5uVjTfRj/KxaxUKCakTBT2AqhM7STC8 yDlzHcGXEijkDfll/8b4eNVuW4U1anCqWNLtY1Rw94bJZiCgZpKlB59cR3qL105rgnpk rHdg== X-Gm-Message-State: AO0yUKWwIhOrnO/hWPaUtrwTRR8zrIq+YAnlvcfRvBuesrF0DWdWUkox 2uonO+T9Inx2SZmmG8y50+c= X-Received: by 2002:a17:906:154:b0:8ae:cd8e:3957 with SMTP id 20-20020a170906015400b008aecd8e3957mr7785048ejh.4.1678055600291; Sun, 05 Mar 2023 14:33:20 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id p23-20020a170906615700b008d5d721f8a4sm3676089ejl.197.2023.03.05.14.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 14:33:19 -0800 (PST) Date: Sun, 5 Mar 2023 23:33:18 +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 Array Rtl8192PciERadioD_Array 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?1759571965107800631?= X-GMAIL-MSGID: =?utf-8?q?1759571965107800631?= Remove empty array Rtl8192PciERadioD_Array and the code where it is used because it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 12 ------------ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 -- drivers/staging/rtl8192e/rtl8192e/table.c | 3 --- drivers/staging/rtl8192e/rtl8192e/table.h | 2 -- 4 files changed, 19 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index fe0ef52c163a..a9e83ba811b0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -649,18 +649,6 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath) bMask12Bits, Rtl819XRadioB_Array[i+1]); - } - break; - case RF90_PATH_D: - for (i = 0; i < RadioD_ArrayLength; i += 2) { - if (Rtl819XRadioD_Array[i] == 0xfe) { - msleep(100); - continue; - } - rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioD_Array[i], - bMask12Bits, - Rtl819XRadioD_Array[i+1]); - } break; default: diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h index 6772ed300591..ac640033e843 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -14,14 +14,12 @@ #define RadioA_ArrayLength RadioA_ArrayLengthPciE #define RadioB_ArrayLength RadioB_ArrayLengthPciE #define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE -#define RadioD_ArrayLength RadioD_ArrayLengthPciE #define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE #define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG #define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array #define Rtl819XRadioA_Array Rtl8192PciERadioA_Array #define Rtl819XRadioB_Array Rtl8192PciERadioB_Array -#define Rtl819XRadioD_Array Rtl8192PciERadioD_Array #define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array #define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rtl8192e/rtl8192e/table.c index 4e97ad4b8fd7..7101061e3519 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -325,9 +325,6 @@ u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] = { 0x007, 0x00000700, }; -u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE] = { - 0x0, }; - u32 Rtl8192PciEMACPHY_Array[] = { 0x03c, 0xffff0000, 0x00000f0f, 0x340, 0xffffffff, 0x161a1a1a, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/rtl8192e/table.h index 981e8b57d3de..b6d4e9696452 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -17,8 +17,6 @@ extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE]; extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE]; #define RadioB_ArrayLengthPciE 78 extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE]; -#define RadioD_ArrayLengthPciE 2 -extern u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE]; #define MACPHY_ArrayLengthPciE 18 extern u32 Rtl8192PciEMACPHY_Array[MACPHY_ArrayLengthPciE]; #define MACPHY_Array_PGLengthPciE 30