Commit Graph

258 Commits

Author SHA1 Message Date
Martin Kaiser
507d1c07e0 ctrl vendor req index is not used
The index for r8188eu's vendor-specific control requests is not used.
Remove the index parameter from usbctrl_vendorreq and pass index 0 to
usb_control_msg.

This patch is an adaptation of commit 3d0be94f62fd ("staging: rtl8188eu:
ctrl vendor req index is not used") for the new r8188eu driver.

Link: https://lore.kernel.org/r/20210818200041.10870-2-martin@kaiser.cx
2021-10-14 16:30:39 +02:00
Carlos Garces
4ddd7165fb use actual request type as parameter
At the moment, usbctrl_vendorreq's requesttype parameter must be set to
1 for reading and 0 for writing. It's then converted to the actual
bmRequestType for the USB control request. We can simplify the code and
avoid this conversion if the caller passes the actual bmRequestType.

This patch is an adaptation of commit 788fde031027 ("staging: rtl8188eu:
use actual request type as parameter") for the new r8188eu driver.

Link: https://lore.kernel.org/r/20210821164859.4351-3-martin@kaiser.cx
2021-10-14 16:30:39 +02:00
Pavel Skripkin
a0549c5041 remove {read,write}_macreg
These 2 functions are unused, so they can be simply removed

Link: https://lore.kernel.org/r/d591e29d77da73790c71f7a8e508a8b16fd48f65.1629789580.git.paskripkin@gmail.com
2021-10-14 16:30:39 +02:00
Michael Straube
2f0a5e695b remove ethernet.h header file
There are only two definitions from ethernet.h used in the driver.
Namely:

Both are only used in the file core/rtw_recv.c. Replace the usage of
ETHERNET_HEADER_SIZE with ETH_HLEN, move the definition of LLC_HEADER_SIZE
into rtw_recv.h and remove the now unused ethernet.h header file.

Link: https://lore.kernel.org/r/20210824123621.10801-4-straube.linux@gmail.com
2021-10-14 16:30:39 +02:00
Michael Straube
a99eff7ea3 remove if_ether.h header file
All constants, declarations and macros in if_ether.h are either
duplicated from <uapi/linux/if_ether.h> or unused. Remove the file
if_ether.h and its includes.

Link: https://lore.kernel.org/r/20210824123621.10801-2-straube.linux@gmail.com
2021-10-14 16:30:39 +02:00
Michael Straube
fe7007c52d remove ip.h header file
The struct ip_options declared in ip.h is only unsed in the optlength
macro which is also defined in ip.h and not used in the driver code.
All other definitions/declarations in ip.h are duplicated from
<include/uapi/linux/ip.h>. Remove the ip.h header file and its includes.

Link: https://lore.kernel.org/r/20210824123621.10801-3-straube.linux@gmail.com
2021-10-14 16:30:39 +02:00
Michael Straube
60aa279428 Use is_multicast_ether_addr instead of custom macro IS_MCAST, the
buffer is properly aligned.

Link: https://lore.kernel.org/r/20210823120106.9633-3-straube.linux@gmail.com
Link: https://lore.kernel.org/r/20210823120106.9633-4-straube.linux@gmail.com
Link: https://lore.kernel.org/r/20210823120106.9633-5-straube.linux@gmail.com
Link: https://lore.kernel.org/r/20210823120106.9633-6-straube.linux@gmail.com
Link: https://lore.kernel.org/r/20210823120106.9633-7-straube.linux@gmail.com
Link: https://lore.kernel.org/r/20210823120106.9633-8-straube.linux@gmail.com
Link: https://lore.kernel.org/r/20210823120106.9633-9-straube.linux@gmail.com
2021-10-14 16:30:30 +02:00
Carlos Garces
3cfc5c26b4 Remove unsused ieee80211_ext.h 2021-10-12 18:21:29 +02:00
Michael Straube
8f94c636ca remove cmd_osdep.h header file
All functions declared in the cmd_osdep.h header file are only used in
a single c source file. Make the functions static and remove the header
file and its includes.

Link: https://lore.kernel.org/r/20210821155151.25822-1-straube.linux@gmail.com
2021-10-12 18:21:11 +02:00
Carlos Garces
91b4661c5f use common ieee80211 constants
Many defined constants in wifi.h are unused and/or available from
<linux/ieee80211.h>, some with slightly different names. Remove
the constants from ieee80211.h and wifi.h and use the common ones. Rename where
necessary.
2021-10-12 17:52:52 +02:00
Carlos Garces
cc69f83f3d Remove empty update_bcn_p2p_ie 2021-10-12 17:17:32 +02:00
Carlos Garces
bb3dc5ca12 Replace _rtw_memmove with memmove 2021-10-12 17:09:01 +02:00
Carlos Garces
71d5c54af2 Replace _rtw_memcpy with memcpy 2021-10-12 17:03:53 +02:00
Martin Kaiser
cd6cb41e0f set pipe only once
Set the pipe for reading or writing in usbctrl_vendorreq only once.
There's no need to set it again for every retry.

This patch is an adaptation of commit 889ed8b5e374 ("staging: rtl8188eu:
set pipe only once") for the new r8188eu driver.

Link: https://lore.kernel.org/r/20210821164859.4351-10-martin@kaiser.cx
2021-10-12 16:50:33 +02:00
Martin Kaiser
972b1c23e2 remove unused members of struct _io_ops
Remove function pointers which are not used by the r8188eu driver.

Link: https://lore.kernel.org/r/20210821164859.4351-9-martin@kaiser.cx
2021-10-12 16:37:54 +02:00
Carlos Garces
cfca9a40c9 Allow reproducible builds 2021-10-12 16:02:19 +02:00
Carlos Garces
1c50f4c603 Removed unused and empty functions 2021-10-12 16:02:19 +02:00
Carlos Garcés
098afbae96 Avoid hide compilation warnings
Must be fixed instead of ignored
2021-10-12 16:02:10 +02:00
Martin Kaiser
d4dcb38048 clean up the usb_writeN
Remove unnecessary variables, check the length.

Link: https://lore.kernel.org/r/20210821164859.4351-8-martin@kaiser.cx
2021-10-11 16:56:09 +02:00
Martin Kaiser
fe504c75a2 clean up the usb_writeXY functions
Remove unnecessary variables, summarize declarations and assignments.

Link: https://lore.kernel.org/r/20210821164859.4351-7-martin@kaiser.cx
2021-10-11 16:51:54 +02:00
Martin Kaiser
ba036a3e14 clean up the usb_readXY functions
Remove unnecessary variables, summarize declarations and assignments.

Link: https://lore.kernel.org/r/20210821164859.4351-6-martin@kaiser.cx
2021-10-11 16:44:22 +02:00
Martin Kaiser
28e0bba794 ctrl vendor req value is always 0x05
The bRequest value for the vendor specific control requests sent by this
driver is always 0x05. Replace the function parameter with the define from
usb_ops.h.

This patch is an adaptation of commit eeb4661560ff ("staging: rtl8188eu:
ctrl vendor req value is always 0x05") for the new r8188eu driver.

Link: https://lore.kernel.org/r/20210818200041.10870-1-martin@kaiser.cx
2021-10-11 16:36:03 +02:00
Martin Kaiser
64831e6777 staging: r8188eu: remove unused define
_HCI_OPS_OS_C_ is not used in the r8188eu driver. Remove it.

Link: https://lore.kernel.org/r/20210821164859.4351-2-martin@kaiser.cx
2021-10-11 16:19:10 +02:00
Carlos Garcés
f218547ef9 Remove unused debug function 2021-10-11 16:14:07 +02:00
Phillip Potter
3255bcf093 remove function _rtw_zvmalloc
Remove the function _rtw_zvmalloc from os_dep/osdep_service.c, as this
function is now unused and is just an inline wrapper around vmalloc
which zeroes out the memory. All previous callers have been converted to
use vzalloc. Also remove the declaration from include/osdep_service.h.

It is considered generally bad practice to declare functions as inline in
the majority of cases, as not only can this qualifier be ignored by the
compiler but the compiler generally makes good decisions about inlining
anyway.

Link: https://lore.kernel.org/r/20210818234853.208448-7-phil@philpotter.co.uk
2021-10-11 16:12:10 +02:00
Phillip Potter
9f0e896c35 remove rtw_zvmalloc preprocessor definition
Remove rtw_zvmalloc preprocessor definition from include/osdep_service.h
as it now has no callers.

Link: https://lore.kernel.org/r/20210818234853.208448-6-phil@philpotter.co.uk
2021-10-11 16:03:12 +02:00
Phillip Potter
2a467a7923 convert all rtw_zvmalloc calls to vzalloc calls
Convert all rtw_zvmalloc calls within the driver to use the existing
kernel vzalloc function, which has the same semantics. Also rewrite the
two places where it is mentioned in comments to say vzalloc, and remove
the redundant cast to struct adapter * in ./os_dep/usb_intf.c as vzalloc
returns void *.

The reason for the conversion is that rtw_zvmalloc is just a
preprocessor definition for _rtw_zvmalloc which itself is just an inline
wrapper around vmalloc which then zeroes the memory out. As vzalloc does
the same thing via usage of __GFP_ZERO, this code is redundant and can
subsequently be removed.

Link: https://lore.kernel.org/r/20210818234853.208448-5-phil@philpotter.co.uk
2021-10-11 15:59:59 +02:00
Phillip Potter
1f0cf855dc remove function _rtw_vmalloc
Remove the function _rtw_vmalloc from os_dep/osdep_service.c, converting
its only user (also in os_dep/osdep_service.c) to use plain vmalloc.
This function is just an inline wrapper around vmalloc which returns a u8
pointer, which isn't needed. Also remove the declaration from
include/osdep_service.h.

It is considered generally bad practice to declare functions as inline in
the majority of cases, as not only can this qualifier be ignored by the
compiler but the compiler generally makes good decisions about inlining
anyway.

Link: https://lore.kernel.org/r/20210818234853.208448-4-phil@philpotter.co.uk
2021-10-11 15:50:48 +02:00
Phillip Potter
6e2f371df5 remove rtw_vmalloc preprocessor definition
Remove rtw_vmalloc preprocessor definition from include/osdep_service.h
as it now has no callers.

Link: https://lore.kernel.org/r/20210818234853.208448-3-phil@philpotter.co.uk
2021-10-11 15:46:55 +02:00
Phillip Potter
397bbaeacf convert only rtw_vmalloc call to vmalloc
Convert the only call to rtw_vmalloc in os_dep/ioctl_linux.c to the
kernel's existing vmalloc function, as rtw_malloc is just a preprocessor
definition for _rtw_vmalloc. The _rtw_vmalloc function is defined inline
and returns a u8, wrapping standard vmalloc. This behaviour is not necessary.

Link: https://lore.kernel.org/r/20210818234853.208448-2-phil@philpotter.co.uk
2021-10-11 15:45:31 +02:00
Greg Kroah-Hartman
76cefd5ae2 remove inline markings from functions in rtw_br_ext.c
The compiler is free to ignore, or follow, "inline" markings so they
really have no use in .c files, so just remove them.

This allows functions to properly show up as being unused when all
callers to them are removed, otherwise gcc does not warn you about this.

Link: https://lore.kernel.org/r/20210816073450.668993-1-gregkh@linuxfoundation.org
2021-10-11 15:15:20 +02:00
Michael Straube
c1f70ba056 use common ieee80211 constants
Many defined constants in wifi.h are unused and/or available from
<linux/ieee80211.h>, some with slightly different names. Remove
the constants from wifi.h and use the common ones. Rename where
necessary.

Link: https://lore.kernel.org/r/20210814165518.8672-1-straube.linux@gmail.com
2021-10-11 15:03:09 +02:00
Fabio M. De Francesco
22a000acb9 Remove defined but not used variables
Remove defined but not used const variables. Issues detected by GCC
running with -Wunused-const-variable option enabled.

Link: https://lore.kernel.org/r/20210814160804.11634-1-fmdefrancesco@gmail.com
2021-10-11 14:25:08 +02:00
Nathan Chancellor
c597fa83da Reorganize error handling in rtw_drv_init()
Looking at the error function as a whole, the error handling is odd
compared to the rest of the kernel, which prefers to set error codes on
goto paths, rather than a global "status" variable which determines the
error code at the end of the function and function calls in the case of
error.

Rearrange the error handling of this function to bring it more inline
with how the kernel does it in most cases, which helps readability.

Link: https://lore.kernel.org/r/20210812204027.338872-4-nathan@kernel.org
Link: https://lore.kernel.org/r/20210813201418.4018631-1-nathan@kernel.org
2021-10-11 14:22:28 +02:00
Nathan Chancellor
8d93cdeefa Remove unused static inline functions in rtw_recv.h
The functions are not used or are called
from functions that are not used so just remove them to remove the
warnings.

Link: https://lore.kernel.org/r/20210812204027.338872-2-nathan@kernel.org
2021-10-11 14:06:16 +02:00
Michael Straube
c8fd0937e4 replace custom hwaddr_aton_i() with mac_pton()
Replace custom hwaddr_aton_i() with mac_pton() in core/ioctl_linux.c
and remove the now unused function hwaddr_aton_i().

Link: https://lore.kernel.org/r/20210812132057.22579-1-straube.linux@gmail.com
2021-10-11 13:55:23 +02:00
Martin Kaiser
0faae6386e use IW_HANDLER to declare wext handlers
Use the IW_HANDLER macro to declare the handler functions for
wext ioctls. We don't have to skip unused ioctl numbers manually.

The same modification was applied to the deprecated rtl8188eu driver in
commit af249fce390f ("staging: rtl8188eu: use IW_HANDLER to declare wext
handlers").

Link: https://lore.kernel.org/r/20210807153636.11712-11-martin@kaiser.cx
2021-10-11 13:37:30 +02:00
Michael Straube
03af80bee9 replace custom macros with is_broadcast_ether_addr
Replace usage of custom macros with is_broadcast_ether_addr. All buffers
are properly aligned. Remove the now unsued macros MacAddr_isBcst and
IS_MAC_ADDRESS_BROADCAST.

Link: https://lore.kernel.org/r/20210805205010.31192-1-straube.linux@gmail.com
2021-10-11 13:29:13 +02:00
Martin Kaiser
2965c273c9 remove the RT_TRACE macro
We've deleted all RT_TRACE calls. The macro itself can now be removed
as well.

Link: https://lore.kernel.org/r/20210807153636.11712-13-martin@kaiser.cx
2021-10-11 13:18:29 +02:00
Larry Finger
9ad10523e3 Remove wrapper rtw_sleep_schedulable()
This wrapper is never used.

Link: https://lore.kernel.org/r/20210805192644.15978-6-Larry.Finger@lwfinger.net
2021-10-11 13:03:59 +02:00
Larry Finger
a5adfa895b Remove wrapper rtw_udelay_os()
This wrapper is a simple call to udelay(). Remove it.

Link: https://lore.kernel.org/r/20210805192644.15978-4-Larry.Finger@lwfinger.net
2021-10-11 13:00:27 +02:00
Larry Finger
7f8451a86e Remove wrapper rtw_mdelay_os()
This wrapper just calls mdelay(). Remove it.

Link: https://lore.kernel.org/r/20210805192644.15978-3-Larry.Finger@lwfinger.net
2021-10-11 12:57:06 +02:00
Carlos Garcés
5bc12edecb
Merge pull request #245 from CGarces/staging_cherrypick
Adapted commits from staging area
2021-10-11 12:18:18 +02:00
Carlos Garcés
cf246719f1 Remove wrapper for memset()
Link: 545d963a9e (diff-16d649c4743131c1aae5f812af5596dae6423bb63eaaf2990b8c89c9a681a913)
2021-10-11 12:09:34 +02:00
Carlos Garcés
76f68bbfcf Remove hidden warnings from makefile 2021-10-11 12:05:35 +02:00
Larry Finger
fdbea81f08 Remove wrapper routine rtw_msleep_os()
The effect of this macro is to call msleep(). Remove the wrapper.

Link: https://lore.kernel.org/r/20210805192644.15978-2-Larry.Finger@lwfinger.net
2021-10-11 10:44:02 +02:00
Larry Finger
1fcfef2e07 Remove rtw_yield_os()
This wrapper is just a call to yield().

Link: https://lore.kernel.org/r/20210805192644.15978-1-Larry.Finger@lwfinger.net
2021-10-11 10:44:02 +02:00
Larry Finger
f1aa80a838 Remove more empty routines
After removing some empty routines in os_dep/osdep_service.c, new routines
become empty. These include rtw_mfree_stainfo(),
_rtw_free_sta_xmit_priv_lock(), and rtw_mfree_recv_priv_lock.

Link: https://lore.kernel.org/r/20210805183717.23007-5-Larry.Finger@lwfinger.net
2021-10-11 10:44:02 +02:00
Larry Finger
51e1f13a91 Remove all calls to _rtw_spinlock_free()
This routine is empty, thus all calls to it can be removed.

Link: https://lore.kernel.org/r/20210805183717.23007-4-Larry.Finger@lwfinger.net
2021-10-11 10:44:02 +02:00
Larry Finger
34ec238387 Remove wrapper around vfree
This call is so simple that there is no need, or use, for a wrapper.

Link: https://lore.kernel.org/r/20210805183717.23007-3-Larry.Finger@lwfinger.net
2021-10-11 10:44:02 +02:00