From patchwork Tue Jan 24 21:01:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 47894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2374736wrn; Tue, 24 Jan 2023 13:10:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXuXv6zupVFKFv6puI3TJfPQn2KCgd7Im65jV6OG8Y/VeKFzkzteDLxXJRk1uRHTeaRzkedK X-Received: by 2002:a17:90a:460f:b0:227:23c3:5db1 with SMTP id w15-20020a17090a460f00b0022723c35db1mr30903392pjg.47.1674594609280; Tue, 24 Jan 2023 13:10:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674594609; cv=none; d=google.com; s=arc-20160816; b=CdIxMbUyXcn+Vt0fLlzM9gmmx8zeK15+DkteT4Z4G8AbAi9rhjj5I+v+/Ni3AaFz2k DMi/GnqGdPiTpOe2RbE9+o6t6YZ6JoIdimIaooJV7T1Yd/4gJGu18JJPEadcL9vKr8mI 1BXtAeIph21c7XJY1eb/XGJxLKUQETD5G7lb7fFVsiU4cr26HUym4HMr30acgXN3UkZG XLDpruKaZd233gjnyKGL1xHA33mHjt+DWoNcw7ojyoosDkC9V/NE8yMFnst9CHisGVXh PV4kYZOREAU8KNXR++o7ACAmdrY8fHhfsYO2KgvBsTwsIzoQ0vhky6VMNd6F8NfOAKg3 11OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=f262yNvP9Yi0uCVDGb2tY7suPNslrKENPGcLqAQAyFQ=; b=Pg97vqeezgH5zQro3yiC3kglTfveq4VmDRBEGes/fzgMABr+/vFzuVyggKQRWUrEEj zcQks9cSjKEnodqdAa6TB+yRUSmJhLV1MSaLhphwtXEWoA3wks/b9ve4yo/ifiAJzJrO qcR+O0bn2FiKfst+GJdJpNRKDqJM13dln7i6l6VvSKsXj2w9g3cgd9+8fU5k3HBjQZlP VmZxN6DREV3S/3dFjSmqd1JCsll7LaxsP4IcEpDnpdtXpJ8ae89au2T6ATddcw+hsCm6 +c7Z6QKTykY3qOE2HHQBHXJBclarLs6Mf8gU8H3MrfMUgsTh3YnZhhU3z/nI79hyQ2v2 FlXg== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mn22-20020a17090b189600b002294c54e84fsi15034601pjb.166.2023.01.24.13.09.49; Tue, 24 Jan 2023 13:10:09 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234593AbjAXVBl (ORCPT + 99 others); Tue, 24 Jan 2023 16:01:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233643AbjAXVBd (ORCPT ); Tue, 24 Jan 2023 16:01:33 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD5A141B43 for ; Tue, 24 Jan 2023 13:01:32 -0800 (PST) Received: from dslb-188-096-139-204.188.096.pools.vodafone-ip.de ([188.96.139.204] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1pKQQ3-0001xR-Hz; Tue, 24 Jan 2023 22:01:27 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 4/4] staging: r8188eu: remove usb_ops_linux.h Date: Tue, 24 Jan 2023 22:01:08 +0100 Message-Id: <20230124210108.62170-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230124210108.62170-1-martin@kaiser.cx> References: <20230124210108.62170-1-martin@kaiser.cx> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE 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?1755939716889031703?= X-GMAIL-MSGID: =?utf-8?q?1755939716889031703?= There's only two defines left in usb_ops_linux.h. Move those defines to usb_ops_linux.c, where they are used. Remove the now empty file usb_ops_linux.h. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 4 ++++ drivers/staging/r8188eu/include/usb_ops.h | 2 -- drivers/staging/r8188eu/include/usb_ops_linux.h | 11 ----------- drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 1 - 4 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/usb_ops_linux.h diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 0f789d5250db..9c940ab8fd41 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -7,6 +7,10 @@ #include "../include/usb_ops.h" #include "../include/rtl8188e_hal.h" +#define VENDOR_CMD_MAX_DATA_LEN 254 + +#define RTW_USB_CONTROL_MSG_TIMEOUT 500/* ms */ + static int usb_read(struct adapter *adapt, u16 value, void *data, u8 size) { struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt); diff --git a/drivers/staging/r8188eu/include/usb_ops.h b/drivers/staging/r8188eu/include/usb_ops.h index ddc46cb44358..5bd8ce37aebf 100644 --- a/drivers/staging/r8188eu/include/usb_ops.h +++ b/drivers/staging/r8188eu/include/usb_ops.h @@ -17,8 +17,6 @@ #define MAX_VENDOR_REQ_CMD_SIZE 254 /* 8188cu SIE Support */ #define MAX_USB_IO_CTL_SIZE (MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT) -#include "usb_ops_linux.h" - /* * Increase and check if the continual_urb_error of this @param dvobjprivei * is larger than MAX_CONTINUAL_URB_ERR diff --git a/drivers/staging/r8188eu/include/usb_ops_linux.h b/drivers/staging/r8188eu/include/usb_ops_linux.h deleted file mode 100644 index b149df7957dd..000000000000 --- a/drivers/staging/r8188eu/include/usb_ops_linux.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#ifndef __USB_OPS_LINUX_H__ -#define __USB_OPS_LINUX_H__ - -#define VENDOR_CMD_MAX_DATA_LEN 254 - -#define RTW_USB_CONTROL_MSG_TIMEOUT 500/* ms */ - -#endif diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c index 583533631133..c9ee1173a1d6 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -4,7 +4,6 @@ #define _USB_OPS_LINUX_C_ #include "../include/drv_types.h" -#include "../include/usb_ops_linux.h" #include "../include/rtl8188e_recv.h" static unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr)