diff options
| author | Martin Kaiser <martin@kaiser.cx> | 2023-01-24 22:01:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-27 10:12:55 +0100 |
| commit | 88c190736580b2b3f2a830e465e5a0915b90a922 (patch) | |
| tree | 37ba09f30be07aa0293bdeaf893316d8f80f2d42 | |
| parent | e39c36d0d01cc586dfe3df7a1727ba80f4feeba6 (diff) | |
staging: r8188eu: remove usb_ops_linux.h
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 <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230124210108.62170-5-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/r8188eu/hal/usb_ops_linux.c | 4 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/include/usb_ops.h | 2 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/include/usb_ops_linux.h | 11 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 1 |
4 files changed, 4 insertions, 14 deletions
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) |