From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 988D0C4338F for ; Thu, 29 Jul 2021 17:10:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7401960F22 for ; Thu, 29 Jul 2021 17:10:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232047AbhG2RKI (ORCPT ); Thu, 29 Jul 2021 13:10:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231420AbhG2RJv (ORCPT ); Thu, 29 Jul 2021 13:09:51 -0400 Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A402C061798 for ; Thu, 29 Jul 2021 10:09:47 -0700 (PDT) Received: by mail-oi1-x22f.google.com with SMTP id x15so9297587oic.9 for ; Thu, 29 Jul 2021 10:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GZZfenwbHTpHPV6TEv9dv9GdGiSYXFbeLBPUeGF0UsI=; b=svE27ZH7fxP2Nmw83E7TtL1IRAUSjhVtTcC0j5+zOWWtG4tyOqlzt1Mc36i0Exg5F/ mQeNHqGgae7tEBTOjNhNJ/Mwv2YDca2CI55pmnWyuQU8vKZYv/cJ9qIxnkldYGPIPxAw /sHvD7q+u5YxgnmnkVrHUqdvR4ge4plJEjhGqd4VnhyyW1TiG4pUfj+kJetGdY5BMzs9 7OBuFPSG5kVrP9bdjV1hyuu8GXvXUL0V95qiX9IbKcQ2jRt+0Y0/HDX5O92aX+OlOu3b fpYV4uaXMeLrpPoa/2zEpP+pmtWFt7X8kipwQ/eIBWXMXrot7CjR60IhbS7jTfMYLv1O VqMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GZZfenwbHTpHPV6TEv9dv9GdGiSYXFbeLBPUeGF0UsI=; b=C7ZmJHKEDjhlDhlIhAxN5wgbhbV88Vx4wQdSmLzX5upGcDJUnyaX8HbVkzuSTvpeDI r3Zwzyh6xAZwHR+xHxzNNRxOq92+EXHR5fFvTbyqgmgAZsOvEn9b4wsIHGJeRjmsIMoL rMMlTOrqoTmjVh34CvkRTnOAjsBEd/UgF++o0AXWTel/CLCFRiOUTrp3l3CQy+ji0rm8 VWARgdl5VDxMI9lXktV9ZcVGQppk69eO5uzC6IsFydhj1FDbP3LZLueyW6wf4bHddP75 VJcpVtvVcW89g8QORIHvxJO7M1MvaoE+53FMKR+I0TjlcdPs5ZsozQHnM5sidJxcIOl7 /hIg== X-Gm-Message-State: AOAM530jyuqTCZraz0RgBinQd66S/Gd3+fcSUlbyicQrWlDFn2CdPJEq 4IXrEIkmSaTxa5Z7bKkAb+A= X-Google-Smtp-Source: ABdhPJw2i2osqm0dnONqwhjUSrFL+IV1Yyg1lS1LaIJuloHFq/3FvyZhCz25ci5oK2miUL1ki1o9Rw== X-Received: by 2002:a05:6808:317:: with SMTP id i23mr10304027oie.69.1627578586750; Thu, 29 Jul 2021 10:09:46 -0700 (PDT) Received: from 2603-8090-2005-39b3-0000-0000-0000-100a.res6.spectrum.com.com (2603-8090-2005-39b3-0000-0000-0000-100a.res6.spectrum.com. [2603:8090:2005:39b3::100a]) by smtp.gmail.com with ESMTPSA id a23sm614358otv.79.2021.07.29.10.09.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 10:09:46 -0700 (PDT) Sender: Larry Finger From: Larry Finger To: gregkh@linuxfoundation.org Cc: phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Larry Finger Subject: [PATCH 3/6] staging: r8188eu: Remove include/rtw_qos.h Date: Thu, 29 Jul 2021 12:09:27 -0500 Message-Id: <20210729170930.23171-4-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210729170930.23171-1-Larry.Finger@lwfinger.net> References: <20210729170930.23171-1-Larry.Finger@lwfinger.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This header file merely defines a single struct. Move that definition to the header file that uses it, and delete rtw_qos.h. Signed-off-by: Larry Finger --- drivers/staging/r8188eu/include/drv_types.h | 1 - drivers/staging/r8188eu/include/rtw_mlme.h | 6 ++++++ drivers/staging/r8188eu/include/rtw_qos.h | 14 -------------- 3 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/rtw_qos.h diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h index eed807d5dbc2..0acc5847a602 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h index 3ef1a008c602..d5b479ae7799 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -313,6 +313,12 @@ struct tdls_info { u8 enable; }; +struct qos_priv { + /* bit mask option: u-apsd, + * s-apsd, ts, block ack... */ + unsigned int qos_option; +}; + struct mlme_priv { spinlock_t lock; int fw_state; /* shall we protect this variable? maybe not necessarily... */ diff --git a/drivers/staging/r8188eu/include/rtw_qos.h b/drivers/staging/r8188eu/include/rtw_qos.h deleted file mode 100644 index 3150e00b8d3a..000000000000 --- a/drivers/staging/r8188eu/include/rtw_qos.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#ifndef _RTW_QOS_H_ -#define _RTW_QOS_H_ - -#include - -struct qos_priv { - unsigned int qos_option; /* bit mask option: u-apsd, - * s-apsd, ts, block ack... */ -}; - -#endif /* _RTL871X_QOS_H_ */ -- 2.32.0