Skip to content

Commit be3b8d0

Browse files
committed
net: wireless: rockchip_wlan: bcmdhd: Remove missing rockchip_dw_pcie_pm_ctrl_for_user call
1 parent 92c91c4 commit be3b8d0

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_pcie_linux.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2422,10 +2422,6 @@ dhdpcie_start_host_dev(dhd_bus_t *bus)
24222422
ret = msm_pcie_pm_control(MSM_PCIE_RESUME, bus->dev->bus->number,
24232423
bus->dev, NULL, 0);
24242424
#endif /* CONFIG_ARCH_MSM */
2425-
#if defined(CUSTOMER_HW_ROCKCHIP) && defined(CONFIG_ARCH_ROCKCHIP)
2426-
if (bus->rc_dev)
2427-
ret = rockchip_dw_pcie_pm_ctrl_for_user(bus->rc_dev, ROCKCHIP_PCIE_PM_CTRL_RESET);
2428-
#endif /* CUSTOMER_HW_ROCKCHIP && CONFIG_ARCH_ROCKCHIP */
24292425

24302426
if (ret) {
24312427
DHD_ERROR(("%s Failed to bring up PCIe link\n", __FUNCTION__));

drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfg80211.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25598,7 +25598,7 @@ wl_cfg80211_sup_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgde
2559825598
}
2559925599
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0)) || \
2560025600
((ANDROID_VERSION >= 13) && (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 94)))
25601-
cfg80211_port_authorized(ndev, (const u8 *)curbssid, NULL, 0, GFP_KERNEL);
25601+
cfg80211_port_authorized(ndev, (const u8 *)curbssid, GFP_KERNEL);
2560225602
#else
2560325603
cfg80211_port_authorized(ndev, (const u8 *)curbssid, GFP_KERNEL);
2560425604
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6, 2, 0) */

drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfgvif.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6095,7 +6095,7 @@ wl_cfg80211_ch_switch_notify(struct net_device *dev, uint16 chanspec, struct wip
60956095
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || \
60966096
((ANDROID_VERSION >= 14) && (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 144))) || \
60976097
((ANDROID_VERSION == 13) && (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 94)))
6098-
cfg80211_ch_switch_notify(dev, &chandef, 0, 0);
6098+
cfg80211_ch_switch_notify(dev, &chandef, 0);
60996099
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(CFG80211_BKPORT_MLO)
61006100
cfg80211_ch_switch_notify(dev, &chandef, 0);
61016101
#else

0 commit comments

Comments
 (0)