diff options
| author | Cai Huoqing <cai.huoqing@linux.dev> | 2023-03-23 12:26:13 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2023-04-03 15:38:49 +0200 |
| commit | 5995f746310108b11c7e377b0ebac4c98e53f9dc (patch) | |
| tree | 20dfcd7148101a32f25263d9a4a6852b9bac8e9a /drivers/net/wireless | |
| parent | wifi: rtw89: fix potential race condition between napi_init and napi_enable (diff) | |
| download | linux-5995f746310108b11c7e377b0ebac4c98e53f9dc.tar.xz linux-5995f746310108b11c7e377b0ebac4c98e53f9dc.zip | |
wifi: rtw89: Remove redundant pci_clear_master
Remove pci_clear_master to simplify the code,
the bus-mastering is also cleared in do_pci_disable_device,
like this:
./drivers/pci/pci.c:2197
static void do_pci_disable_device(struct pci_dev *dev)
{
u16 pci_command;
pci_read_config_word(dev, PCI_COMMAND, &pci_command);
if (pci_command & PCI_COMMAND_MASTER) {
pci_command &= ~PCI_COMMAND_MASTER;
pci_write_config_word(dev, PCI_COMMAND, pci_command);
}
pcibios_disable_device(dev);
}.
And dev->is_busmaster is set to 0 in pci_disable_device.
Signed-off-by: Cai Huoqing <cai.huoqing@linux.dev>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230323112613.7550-5-cai.huoqing@linux.dev
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/realtek/rtw89/pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c index 4025aabe0604..68f0fed6d31e 100644 --- a/drivers/net/wireless/realtek/rtw89/pci.c +++ b/drivers/net/wireless/realtek/rtw89/pci.c @@ -2694,7 +2694,6 @@ static int rtw89_pci_claim_device(struct rtw89_dev *rtwdev, static void rtw89_pci_declaim_device(struct rtw89_dev *rtwdev, struct pci_dev *pdev) { - pci_clear_master(pdev); pci_disable_device(pdev); } |