From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 121745381 for ; Sun, 20 Feb 2022 10:02:23 +0000 (UTC) Received: by mail-ej1-f54.google.com with SMTP id qx21so25553274ejb.13 for ; Sun, 20 Feb 2022 02:02:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZkI9AnkK9Hx4PE0VopfNSysIyR8hiEwnCg1vfX4w8qo=; b=UqLm+85YwRk5e03YO1uqe0i/H9qa5BM5sRFcQacfx7hN7MKcioBW+nf+ckCVknmxG0 PcRpIDaY2irp9R5pqLcuqTlIR5daTVtabb9O3zs0JuzXbiX7AE/FyAXcsbPuY6x2X6+L +CXmPZVhU+51kR3LD6YSwZbxWngdyYe79G4Se/vF93Oeyme8Txr8fvsm5OoCBwNjFfcC xzpZo/FtO6Dlflp5kWOz3Qf0WOoh7PCrJ4DlJjSyS7/xjaidlL5/6rM84sJzCosyZQY/ OMIKk2CDrsdc/oA/9nVgh9LUlJeML6aABSyfjoq3DzBkTc+mSRO7V0+f887r6chLIg1Y miuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZkI9AnkK9Hx4PE0VopfNSysIyR8hiEwnCg1vfX4w8qo=; b=rG9+o9q02XA4S6K8anGVtiz612ib370d3NL7+mHQwyl+o8cIgfcgR31QDBWc/bM1FB 1foo1VeHyIGKI1oFo4jMAbhDEjKFgj+HZ/iV8ntz6gPnAVuLll0Rh5OKWwgOGAb/Juey w3e3GsDisvRvKGBsFO4o6TwDoZlG1nFKXL1atIRQm3SuzJSqvPVjdi4xyAFMmyE8x96f 6K30YaoMZzvQy/eyawteZSOo9nt8A1AawTumQjyPUtOmBXPo5OFqAbI91oYTj5umr9+p ftdrHO5/ezjE8cGUN2Y50xdsGylls4JY8IG2PbuJXMJOqmQ7NBOWCWKB23P+lYTpvrOj 4ADw== X-Gm-Message-State: AOAM531MF5HJR+tOGv41WSNrE3DdUdsbTkuelt+oB5hJv5ZHJmzMSBF0 4b3fJL6gj/nV495XGRg08yI= X-Google-Smtp-Source: ABdhPJwTnByq03MA+PvXGyxT/lHmMG/Sx7fAOD0r2B6r+Q/KfcPCPs7eFqmUhBEvkjnFhLaGdewsmA== X-Received: by 2002:a17:907:c92:b0:6b5:c8ae:7918 with SMTP id gi18-20020a1709070c9200b006b5c8ae7918mr11823612ejc.531.1645351341478; Sun, 20 Feb 2022 02:02:21 -0800 (PST) Received: from localhost.localdomain (ip5f5abb8f.dynamic.kabel-deutschland.de. [95.90.187.143]) by smtp.gmail.com with ESMTPSA id dx7sm3265223ejb.23.2022.02.20.02.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 02:02:21 -0800 (PST) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/5] staging: r8188eu: remove enum odm_bw Date: Sun, 20 Feb 2022 11:02:10 +0100 Message-Id: <20220220100212.7466-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220220100212.7466-1-straube.linux@gmail.com> References: <20220220100212.7466-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The enums odm_bw and ht_channel_width are redundant. Keep ht_channel_width and remove odm_bw. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/odm.c | 4 ++-- drivers/staging/r8188eu/include/odm.h | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c index 6f594ae33c6e..5d2f934d78ae 100644 --- a/drivers/staging/r8188eu/hal/odm.c +++ b/drivers/staging/r8188eu/hal/odm.c @@ -266,7 +266,7 @@ static void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm) u8 i; struct sta_info *pEntry; - if (*pDM_Odm->pBandWidth == ODM_BW40M) { + if (*pDM_Odm->pBandWidth == HT_CHANNEL_WIDTH_40) { if (*pDM_Odm->pSecChOffset == 1) pDM_Odm->ControlChannel = *pDM_Odm->pChannel - 2; else if (*pDM_Odm->pSecChOffset == 2) @@ -766,7 +766,7 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u } else if (rssi_level == DM_RATR_STA_MIDDLE) { rate_bitmap = 0x000ff000; } else { - if (*pDM_Odm->pBandWidth == ODM_BW40M) + if (*pDM_Odm->pBandWidth == HT_CHANNEL_WIDTH_40) rate_bitmap = 0x000ff015; else rate_bitmap = 0x000ff005; diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h index 0e85bd88ab8a..fed12203c558 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -166,12 +166,6 @@ enum odm_wireless_mode { ODM_WM_AUTO = BIT(5), }; -/* ODM_CMNINFO_BW */ -enum odm_bw { - ODM_BW20M = 0, - ODM_BW40M = 1, -}; - struct odm_ra_info { u8 RateID; u32 RateMask; -- 2.35.1