diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 13:31:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 13:31:29 -0700 |
commit | e0dccbdf5ac7ccb9da5612100dedba302f3ebcfe (patch) | |
tree | 0bdabbf13844ae18da61bc060348850a8038f0ba /drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h | |
parent | cf482a49af564a3044de3178ea28f10ad5921b38 (diff) | |
parent | e2a5be107f52cefb9010ccae6f569c3ddaa954cc (diff) |
Merge tag 'staging-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging / IIO driver updates from Greg KH:
"Here is the big staging and iio driver update for 5.2-rc1.
Lots of tiny fixes all over the staging and IIO driver trees here,
along with some new IIO drivers.
The "counter" subsystem was added in here as well, as it is needed by
the IIO drivers and subsystem.
Also we ended up deleting two drivers, making this pull request remove
a few hundred thousand lines of code, always a nice thing to see. Both
of the drivers removed have been replaced with "real" drivers in their
various subsystem directories, and they will be coming to you from
those locations during this merge window.
There are some core vt/selection changes in here, that was due to some
cleanups needed for the speakup fixes. Those have all been acked by
the various subsystem maintainers (i.e. me), so those are ok.
We also added a few new drivers, for some odd hardware, giving new
developers plenty to work on with basic coding style cleanups to come
in the near future.
Other than that, nothing unusual here.
All of these have been in linux-next for a while with no reported
issues, other than an odd gcc warning for one of the new drivers that
should be fixed up soon"
[ I fixed up the warning myself - Linus ]
* tag 'staging-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (663 commits)
staging: kpc2000: kpc_spi: Fix build error for {read,write}q
Staging: rtl8192e: Remove extra space before break statement
Staging: rtl8192u: ieee80211: Fix if-else indentation warning
Staging: rtl8192u: ieee80211: Fix indentation errors by removing extra spaces
staging: most: cdev: fix chrdev_region leak in mod_exit
staging: wlan-ng: Fix improper SPDX comment style
staging: rtl8192u: ieee80211: Resolve ERROR reported by checkpatch
staging: vc04_services: bcm2835-camera: Compress two lines into one line
staging: rtl8723bs: core: Use !x in place of NULL comparison.
staging: rtl8723bs: core: Prefer using the BIT Macro.
staging: fieldbus: anybus-s: fix wait_for_completion_timeout return handling
staging: kpc2000: fix up build problems with readq()
staging: rtlwifi: move remaining phydm .h files
staging: rtlwifi: strip down phydm .h files
staging: rtlwifi: delete the staging driver
staging: fieldbus: anybus-s: rename bus id field to avoid confusion
staging: fieldbus: anybus-s: keep device bus id in bus endianness
Staging: sm750fb: Change *array into *const array
staging: rtl8192u: ieee80211: Fix spelling mistake
staging: rtl8192u: ieee80211: Replace bit shifting with BIT macro
...
Diffstat (limited to 'drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h')
-rw-r--r-- | drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h b/drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h deleted file mode 100644 index 04cee38c33f9..000000000000 --- a/drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h +++ /dev/null @@ -1,104 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** - * - * Copyright(c) 2016 Realtek Corporation. - * - * Contact Information: - * wlanfae <wlanfae@realtek.com> - * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park, - * Hsinchu 300, Taiwan. - * - * Larry Finger <Larry.Finger@lwfinger.net> - * - *****************************************************************************/ -#ifndef _HAL_H2CEXTRAINFO_H2C_C2H_NIC_H_ -#define _HAL_H2CEXTRAINFO_H2C_C2H_NIC_H_ -#define PHY_PARAMETER_INFO_GET_LENGTH(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 0, 8) -#define PHY_PARAMETER_INFO_SET_LENGTH(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 0, 8, __value) -#define PHY_PARAMETER_INFO_GET_IO_CMD(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 8, 7) -#define PHY_PARAMETER_INFO_SET_IO_CMD(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 8, 7, __value) -#define PHY_PARAMETER_INFO_GET_MSK_EN(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 15, 1) -#define PHY_PARAMETER_INFO_SET_MSK_EN(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 15, 1, __value) -#define PHY_PARAMETER_INFO_GET_LLT_PG_BNDY(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8) -#define PHY_PARAMETER_INFO_SET_LLT_PG_BNDY(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value) -#define PHY_PARAMETER_INFO_GET_EFUSE_RSVDPAGE_LOC(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8) -#define PHY_PARAMETER_INFO_SET_EFUSE_RSVDPAGE_LOC(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value) -#define PHY_PARAMETER_INFO_GET_EFUSE_PATCH_EN(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8) -#define PHY_PARAMETER_INFO_SET_EFUSE_PATCH_EN(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value) -#define PHY_PARAMETER_INFO_GET_RF_ADDR(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8) -#define PHY_PARAMETER_INFO_SET_RF_ADDR(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value) -#define PHY_PARAMETER_INFO_GET_IO_ADDR(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 16) -#define PHY_PARAMETER_INFO_SET_IO_ADDR(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 16, __value) -#define PHY_PARAMETER_INFO_GET_DELAY_VALUE(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 16) -#define PHY_PARAMETER_INFO_SET_DELAY_VALUE(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 16, __value) -#define PHY_PARAMETER_INFO_GET_RF_PATH(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 24, 8) -#define PHY_PARAMETER_INFO_SET_RF_PATH(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 24, 8, __value) -#define PHY_PARAMETER_INFO_GET_DATA(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X04, 0, 32) -#define PHY_PARAMETER_INFO_SET_DATA(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X04, 0, 32, __value) -#define PHY_PARAMETER_INFO_GET_MASK(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X08, 0, 32) -#define PHY_PARAMETER_INFO_SET_MASK(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X08, 0, 32, __value) -#define CHANNEL_INFO_GET_CHANNEL(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 0, 8) -#define CHANNEL_INFO_SET_CHANNEL(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 0, 8, __value) -#define CHANNEL_INFO_GET_PRI_CH_IDX(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 8, 4) -#define CHANNEL_INFO_SET_PRI_CH_IDX(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 8, 4, __value) -#define CHANNEL_INFO_GET_BANDWIDTH(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 12, 4) -#define CHANNEL_INFO_SET_BANDWIDTH(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 12, 4, __value) -#define CHANNEL_INFO_GET_TIMEOUT(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 8) -#define CHANNEL_INFO_SET_TIMEOUT(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 8, __value) -#define CHANNEL_INFO_GET_ACTION_ID(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 24, 7) -#define CHANNEL_INFO_SET_ACTION_ID(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 24, 7, __value) -#define CHANNEL_INFO_GET_CH_EXTRA_INFO(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 31, 1) -#define CHANNEL_INFO_SET_CH_EXTRA_INFO(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 31, 1, __value) -#define CH_EXTRA_INFO_GET_CH_EXTRA_INFO_ID(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 0, 7) -#define CH_EXTRA_INFO_SET_CH_EXTRA_INFO_ID(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 0, 7, __value) -#define CH_EXTRA_INFO_GET_CH_EXTRA_INFO(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 7, 1) -#define CH_EXTRA_INFO_SET_CH_EXTRA_INFO(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 7, 1, __value) -#define CH_EXTRA_INFO_GET_CH_EXTRA_INFO_SIZE(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 8, 8) -#define CH_EXTRA_INFO_SET_CH_EXTRA_INFO_SIZE(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 8, 8, __value) -#define CH_EXTRA_INFO_GET_CH_EXTRA_INFO_DATA(__extra_info) \ - LE_BITS_TO_4BYTE(__extra_info + 0X00, 16, 1) -#define CH_EXTRA_INFO_SET_CH_EXTRA_INFO_DATA(__extra_info, __value) \ - SET_BITS_TO_LE_4BYTE(__extra_info + 0X00, 16, 1, __value) -#endif |