Merge tag 'staging-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging driver updates from Greg KH:
 "Here is the large set of staging driver changes for 6.1-rc1.

  Nothing really interesting in here at all except we deleted a driver
  (fwserial) as no one had been using it for a long time. Other than
  that, just the normal cleanups and minor fixes:

   - rtl8723bs driver cleanups

   - loads of r8188eu driver cleanups, making the driver smaller and
     fixing up some firmware dependency issues.

   - vt6655 driver cleanups.

   - lots of other small staging driver cleanups.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (266 commits)
  staging: rtl8192e: Rename variable Bandwidth to avoid CamelCase
  staging: r8188eu: remove PHY_RFConfig8188E()
  staging: r8188eu: remove PHY_RF6052_Config8188E()
  staging: r8188eu: convert ODM_ReadAndConfig_AGC_TAB_1T_8188E() to int
  staging: r8188eu: convert ODM_ReadAndConfig_PHY_REG_1T_8188E() to int
  staging: r8188eu: convert ODM_ReadAndConfig_RadioA_1T_8188E() to int
  staging: r8188eu: convert ODM_ReadAndConfig_MAC_REG_8188E() to int
  staging: rtl8192e: cmdpkt: Use skb_put_data() instead of skb_put/memcpy pair
  staging: r8188eu: Use skb_put_data() instead of skb_put/memcpy pair
  staging: r8188eu: remove hal/odm_RegConfig8188E.c
  staging: r8188eu: make odm_ConfigRF_RadioA_8188E() static
  staging: r8188eu: make odm_ConfigMAC_8188E() static
  staging: r8188eu: don't check for stop/removal in the blink worker
  staging: r8188eu: don't check bSurpriseRemoved in SwLedOff
  staging: rtl8192e: Remove unused variables ForcedAMSDUMaxSize, ...
  staging: rtl8192e: Rename CurrentMPDU..., ForcedAMPDU... and ForcedMPDU...
  staging: rtl8192e: Rename SelfMimoPs, CurrentOpMode and bForcedShortGI
  staging: rtl8192e: Rename PeerMimoPs, IOTAction and IOTRaFunc
  staging: rtl8192e: Rename RxRe...WinSize, RxReorder... and RxReorderDr...
  staging: rtl8192e: Rename szRT2RTAggBuffer, bRegRxRe... and bCurRxReo...
  ...

diff --combined drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 2d09be6425d5b3ea82927c9c899484a78ecf4d84,aafca43fb5b1b02c8134d0b5bd54c8fdf1e076e3..6aeb169c6ebf0a0effdc474a0fcd1f3be8fbce84
--- 1/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
--- 2/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@@ -198,7 -198,7 +198,7 @@@ static int rtw_ieee80211_channel_to_fre
        if (band == NL80211_BAND_2GHZ) {
                if (chan == 14)
                        return 2484;
-              else if (chan < 14)
+               else if (chan < 14)
                        return 2407 + chan * 5;
        }
  
@@@ -810,7 -810,7 +810,7 @@@ static int rtw_cfg80211_set_encryption(
                                                memcpy(padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len));
                                                memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);
                                                memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);
-                                               padapter->securitypriv.binstallGrpkey = true;
+                                               padapter->securitypriv.binstallGrpkey = true;
  
                                                padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx;
                                                rtw_set_key(padapter, &padapter->securitypriv, param->u.crypt.idx, 1, true);
@@@ -850,8 -850,8 +850,8 @@@ exit
  }
  
  static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
 -                              u8 key_index, bool pairwise, const u8 *mac_addr,
 -                              struct key_params *params)
 +                              int link_id, u8 key_index, bool pairwise,
 +                              const u8 *mac_addr, struct key_params *params)
  {
        char *alg_name;
        u32 param_len;
@@@ -920,9 -920,9 +920,9 @@@
  
                ret = rtw_cfg80211_ap_set_encryption(ndev, param, param_len);
        } else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == true
-                 || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) {
-                 ret =  rtw_cfg80211_set_encryption(ndev, param, param_len);
-         }
+               || check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) {
+               ret =  rtw_cfg80211_set_encryption(ndev, param, param_len);
+       }
  
  addkey_end:
        kfree(param);
@@@ -932,8 -932,8 +932,8 @@@
  }
  
  static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev,
 -                              u8 key_index, bool pairwise, const u8 *mac_addr,
 -                              void *cookie,
 +                              int link_id, u8 key_index, bool pairwise,
 +                              const u8 *mac_addr, void *cookie,
                                void (*callback)(void *cookie,
                                                 struct key_params*))
  {
@@@ -941,8 -941,7 +941,8 @@@
  }
  
  static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
 -                              u8 key_index, bool pairwise, const u8 *mac_addr)
 +                              int link_id, u8 key_index, bool pairwise,
 +                              const u8 *mac_addr)
  {
        struct adapter *padapter = rtw_netdev_priv(ndev);
        struct security_priv *psecuritypriv = &padapter->securitypriv;
@@@ -956,7 -955,7 +956,7 @@@
  }
  
  static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
 -      struct net_device *ndev, u8 key_index
 +      struct net_device *ndev, int link_id, u8 key_index
        , bool unicast, bool multicast
        )
  {
@@@ -1066,7 -1065,7 +1066,7 @@@ static int cfg80211_rtw_change_iface(st
                }
        }
  
-       if (_FAIL == rtw_pwr_wakeup(padapter)) {
+       if (rtw_pwr_wakeup(padapter) == _FAIL) {
                ret = -EPERM;
                goto exit;
        }
@@@ -1240,7 -1239,7 +1240,7 @@@ static int cfg80211_rtw_scan(struct wip
        }
  
        rtw_ps_deny(padapter, PS_DENY_SCAN);
-       if (_FAIL == rtw_pwr_wakeup(padapter)) {
+       if (rtw_pwr_wakeup(padapter) == _FAIL) {
                need_indicate_scan_done = true;
                goto check_need_indicate_scan_done;
        }
@@@ -1500,49 -1499,49 +1500,49 @@@ static int rtw_cfg80211_set_wpa_ie(stru
                pairwise_cipher = WPA_CIPHER_NONE;
  
        switch (group_cipher) {
-               case WPA_CIPHER_NONE:
-                       padapter->securitypriv.dot118021XGrpPrivacy = _NO_PRIVACY_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
-                       break;
-               case WPA_CIPHER_WEP40:
-                       padapter->securitypriv.dot118021XGrpPrivacy = _WEP40_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
-                       break;
-               case WPA_CIPHER_TKIP:
-                       padapter->securitypriv.dot118021XGrpPrivacy = _TKIP_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled;
-                       break;
-               case WPA_CIPHER_CCMP:
-                       padapter->securitypriv.dot118021XGrpPrivacy = _AES_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled;
-                       break;
-               case WPA_CIPHER_WEP104:
-                       padapter->securitypriv.dot118021XGrpPrivacy = _WEP104_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
-                       break;
+       case WPA_CIPHER_NONE:
+               padapter->securitypriv.dot118021XGrpPrivacy = _NO_PRIVACY_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
+               break;
+       case WPA_CIPHER_WEP40:
+               padapter->securitypriv.dot118021XGrpPrivacy = _WEP40_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
+               break;
+       case WPA_CIPHER_TKIP:
+               padapter->securitypriv.dot118021XGrpPrivacy = _TKIP_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled;
+               break;
+       case WPA_CIPHER_CCMP:
+               padapter->securitypriv.dot118021XGrpPrivacy = _AES_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled;
+               break;
+       case WPA_CIPHER_WEP104:
+               padapter->securitypriv.dot118021XGrpPrivacy = _WEP104_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
+               break;
        }
  
        switch (pairwise_cipher) {
-               case WPA_CIPHER_NONE:
-                       padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
-                       break;
-               case WPA_CIPHER_WEP40:
-                       padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
-                       break;
-               case WPA_CIPHER_TKIP:
-                       padapter->securitypriv.dot11PrivacyAlgrthm = _TKIP_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled;
-                       break;
-               case WPA_CIPHER_CCMP:
-                       padapter->securitypriv.dot11PrivacyAlgrthm = _AES_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled;
-                       break;
-               case WPA_CIPHER_WEP104:
-                       padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_;
-                       padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
-                       break;
+       case WPA_CIPHER_NONE:
+               padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
+               break;
+       case WPA_CIPHER_WEP40:
+               padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
+               break;
+       case WPA_CIPHER_TKIP:
+               padapter->securitypriv.dot11PrivacyAlgrthm = _TKIP_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled;
+               break;
+       case WPA_CIPHER_CCMP:
+               padapter->securitypriv.dot11PrivacyAlgrthm = _AES_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled;
+               break;
+       case WPA_CIPHER_WEP104:
+               padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_;
+               padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
+               break;
        }
  
        {/* handle wps_ie */
@@@ -1583,7 -1582,7 +1583,7 @@@ static int cfg80211_rtw_join_ibss(struc
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        int ret = 0;
  
-       if (_FAIL == rtw_pwr_wakeup(padapter)) {
+       if (rtw_pwr_wakeup(padapter) == _FAIL) {
                ret = -EPERM;
                goto exit;
        }
@@@ -1674,7 -1673,7 +1674,7 @@@ static int cfg80211_rtw_connect(struct 
        }
  
        rtw_ps_deny(padapter, PS_DENY_JOIN);
-       if (_FAIL == rtw_pwr_wakeup(padapter)) {
+       if (rtw_pwr_wakeup(padapter) == _FAIL) {
                ret = -EPERM;
                goto exit;
        }
@@@ -1849,6 -1848,7 +1849,7 @@@ static int cfg80211_rtw_get_txpower(str
  inline bool rtw_cfg80211_pwr_mgmt(struct adapter *adapter)
  {
        struct rtw_wdev_priv *rtw_wdev_priv = adapter_wdev_data(adapter);
+ 
        return rtw_wdev_priv->power_mgmt;
  }
  
@@@ -1954,6 -1954,7 +1955,7 @@@ void rtw_cfg80211_indicate_sta_assoc(st
        {
                struct station_info sinfo = {};
                u8 ie_offset;
+ 
                if (GetFrameSubType(pmgmt_frame) == WIFI_ASSOCREQ)
                        ie_offset = _ASOCREQ_IE_OFFSET_;
                else /*  WIFI_REASSOCREQ */
@@@ -2085,7 -2086,8 +2087,8 @@@ static netdev_tx_t rtw_cfg80211_monitor
                memcpy(pdata + sizeof(dst_mac_addr), src_mac_addr, sizeof(src_mac_addr));
  
                /* Use the real net device to transmit the packet */
-               return _rtw_xmit_entry(skb, padapter->pnetdev);
+               _rtw_xmit_entry(skb, padapter->pnetdev);
+               return NETDEV_TX_OK;
  
        } else if ((frame_control & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE)) ==
                   (IEEE80211_FTYPE_MGMT|IEEE80211_STYPE_ACTION)) {
@@@ -2348,7 -2350,7 +2351,7 @@@ static int cfg80211_rtw_start_ap(struc
  }
  
  static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
-                                 struct cfg80211_beacon_data *info)
+               struct cfg80211_beacon_data *info)
  {
        struct adapter *adapter = rtw_netdev_priv(ndev);
  
@@@ -2467,7 -2469,7 +2470,7 @@@ static int      cfg80211_rtw_dump_station(st
        spin_lock_bh(&pstapriv->asoc_list_lock);
        psta = rtw_sta_info_get_by_idx(idx, pstapriv);
        spin_unlock_bh(&pstapriv->asoc_list_lock);
-       if (NULL == psta) {
+       if (psta == NULL) {
                ret = -ENOENT;
                goto exit;
        }
@@@ -2602,7 -2604,7 +2605,7 @@@ static int cfg80211_rtw_mgmt_tx(struct 
                goto exit;
  
        rtw_ps_deny(padapter, PS_DENY_MGNT_TX);
-       if (_FAIL == rtw_pwr_wakeup(padapter)) {
+       if (rtw_pwr_wakeup(padapter) == _FAIL) {
                ret = -EFAULT;
                goto cancel_ps_deny;
        }

diff --combined drivers/staging/sm750fb/sm750.c
index ce04c38f6afd0fba33565c31b23bfae4fd32f019,3e09e56d3930cc95b235deb420a6362a21d47598..168ae2e9005d7606e31dfec4c28983ab88dd8ecd
--- 1/drivers/staging/sm750fb/sm750.c
--- 2/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@@ -1,5 -1,4 +1,5 @@@
  // SPDX-License-Identifier: GPL-2.0
 +#include <linux/aperture.h>
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/errno.h>
@@@ -387,7 -386,8 +387,8 @@@ static int lynxfb_ops_set_par(struct fb
  
        ret = lynxfb_set_color_offsets(info);
  
-       var->height = var->width = -1;
+       var->height = -1;
+       var->width = -1;
        var->accel_flags = 0;/*FB_ACCELF_TEXT;*/
  
        if (ret) {
@@@ -499,7 -499,8 +500,8 @@@ static int lynxfb_ops_check_var(struct 
                return ret;
        }
  
-       var->height = var->width = -1;
+       var->height = -1;
+       var->width = -1;
        var->accel_flags = 0;/* FB_ACCELF_TEXT; */
  
        /* check if current fb's video memory big enough to hold the onscreen*/
@@@ -724,7 -725,8 +726,8 @@@ static int lynxfb_set_fbinfo(struct fb_
                0x800f0 + (int)crtc->channel * 0x140;
  
        pr_info("crtc->cursor.mmio = %p\n", crtc->cursor.mmio);
-       crtc->cursor.max_h = crtc->cursor.max_w = 64;
+       crtc->cursor.max_h = 64;
+       crtc->cursor.max_w = 64;
        crtc->cursor.size = crtc->cursor.max_h * crtc->cursor.max_w * 2 / 8;
        crtc->cursor.vstart = sm750_dev->pvMem + crtc->cursor.offset;
  
@@@ -988,16 -990,22 +991,16 @@@ release_fb
  
  static int lynxfb_kick_out_firmware_fb(struct pci_dev *pdev)
  {
 -      struct apertures_struct *ap;
 +      resource_size_t base = pci_resource_start(pdev, 0);
 +      resource_size_t size = pci_resource_len(pdev, 0);
        bool primary = false;
  
 -      ap = alloc_apertures(1);
 -      if (!ap)
 -              return -ENOMEM;
 -
 -      ap->ranges[0].base = pci_resource_start(pdev, 0);
 -      ap->ranges[0].size = pci_resource_len(pdev, 0);
  #ifdef CONFIG_X86
        primary = pdev->resource[PCI_ROM_RESOURCE].flags &
                                        IORESOURCE_ROM_SHADOW;
  #endif
 -      remove_conflicting_framebuffers(ap, "sm750_fb1", primary);
 -      kfree(ap);
 -      return 0;
 +
 +      return aperture_remove_conflicting_devices(base, size, primary, "sm750_fb1");
  }
  
  static int lynxfb_pci_probe(struct pci_dev *pdev,
@@@ -1022,7 -1030,8 +1025,8 @@@
        if (!sm750_dev)
                return err;
  
-       sm750_dev->fbinfo[0] = sm750_dev->fbinfo[1] = NULL;
+       sm750_dev->fbinfo[0] = NULL;
+       sm750_dev->fbinfo[1] = NULL;
        sm750_dev->devid = pdev->device;
        sm750_dev->revid = pdev->revision;
        sm750_dev->pdev = pdev;