Merge tag 'wireless-drivers-2020-04-14' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says: ==================== wireless-drivers fixes for v5.7 First set of fixes for v5.6. Fixes for a crash and for two compiler warnings. brcmfmac * fix a crash related to monitor interface ath11k * fix compiler warnings without CONFIG_THERMAL rtw88 * fix compiler warnings related to suspend and resume functions ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@ -36,12 +36,13 @@ static inline int ath11k_thermal_register(struct ath11k_base *sc)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void ath11k_thermal_unregister(struct ath11k *ar)
|
static inline void ath11k_thermal_unregister(struct ath11k_base *sc)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state)
|
static inline int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state)
|
||||||
{
|
{
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void ath11k_thermal_event_temperature(struct ath11k *ar,
|
static inline void ath11k_thermal_event_temperature(struct ath11k *ar,
|
||||||
|
@ -729,9 +729,18 @@ static int brcmf_net_mon_stop(struct net_device *ndev)
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static netdev_tx_t brcmf_net_mon_start_xmit(struct sk_buff *skb,
|
||||||
|
struct net_device *ndev)
|
||||||
|
{
|
||||||
|
dev_kfree_skb_any(skb);
|
||||||
|
|
||||||
|
return NETDEV_TX_OK;
|
||||||
|
}
|
||||||
|
|
||||||
static const struct net_device_ops brcmf_netdev_ops_mon = {
|
static const struct net_device_ops brcmf_netdev_ops_mon = {
|
||||||
.ndo_open = brcmf_net_mon_open,
|
.ndo_open = brcmf_net_mon_open,
|
||||||
.ndo_stop = brcmf_net_mon_stop,
|
.ndo_stop = brcmf_net_mon_stop,
|
||||||
|
.ndo_start_xmit = brcmf_net_mon_start_xmit,
|
||||||
};
|
};
|
||||||
|
|
||||||
int brcmf_net_mon_attach(struct brcmf_if *ifp)
|
int brcmf_net_mon_attach(struct brcmf_if *ifp)
|
||||||
|
@ -1338,22 +1338,17 @@ static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev)
|
|||||||
rtw_pci_link_cfg(rtwdev);
|
rtw_pci_link_cfg(rtwdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
static int __maybe_unused rtw_pci_suspend(struct device *dev)
|
||||||
static int rtw_pci_suspend(struct device *dev)
|
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rtw_pci_resume(struct device *dev)
|
static int __maybe_unused rtw_pci_resume(struct device *dev)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SIMPLE_DEV_PM_OPS(rtw_pm_ops, rtw_pci_suspend, rtw_pci_resume);
|
static SIMPLE_DEV_PM_OPS(rtw_pm_ops, rtw_pci_suspend, rtw_pci_resume);
|
||||||
#define RTW_PM_OPS (&rtw_pm_ops)
|
|
||||||
#else
|
|
||||||
#define RTW_PM_OPS NULL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int rtw_pci_claim(struct rtw_dev *rtwdev, struct pci_dev *pdev)
|
static int rtw_pci_claim(struct rtw_dev *rtwdev, struct pci_dev *pdev)
|
||||||
{
|
{
|
||||||
@ -1582,7 +1577,7 @@ static struct pci_driver rtw_pci_driver = {
|
|||||||
.id_table = rtw_pci_id_table,
|
.id_table = rtw_pci_id_table,
|
||||||
.probe = rtw_pci_probe,
|
.probe = rtw_pci_probe,
|
||||||
.remove = rtw_pci_remove,
|
.remove = rtw_pci_remove,
|
||||||
.driver.pm = RTW_PM_OPS,
|
.driver.pm = &rtw_pm_ops,
|
||||||
};
|
};
|
||||||
module_pci_driver(rtw_pci_driver);
|
module_pci_driver(rtw_pci_driver);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user