[7/8] ionic: Remove redundant pci_clear_master

Message ID 20230323090314.22431-7-cai.huoqing@linux.dev
State New
Headers
Series [1/8] net: liquidio: Remove redundant pci_clear_master |

Commit Message

Cai Huoqing March 23, 2023, 9:03 a.m. UTC
  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>
---
 drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 -
 1 file changed, 1 deletion(-)
  

Comments

Nelson, Shannon March 23, 2023, 4:32 p.m. UTC | #1
On 3/23/23 2:03 AM, Cai Huoqing wrote:
> 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>

Thanks!
sln

Acked-by: Shannon Nelson <shannon.nelson@amd.com>

> ---
>   drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
> index e508f8eb43bf..b8678da1cce5 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
> @@ -392,7 +392,6 @@ static void ionic_remove(struct pci_dev *pdev)
>          ionic_port_reset(ionic);
>          ionic_reset(ionic);
>          ionic_dev_teardown(ionic);
> -       pci_clear_master(pdev);
>          ionic_unmap_bars(ionic);
>          pci_release_regions(pdev);
>          pci_disable_device(pdev);
> --
> 2.34.1
>
  

Patch

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
index e508f8eb43bf..b8678da1cce5 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
@@ -392,7 +392,6 @@  static void ionic_remove(struct pci_dev *pdev)
 	ionic_port_reset(ionic);
 	ionic_reset(ionic);
 	ionic_dev_teardown(ionic);
-	pci_clear_master(pdev);
 	ionic_unmap_bars(ionic);
 	pci_release_regions(pdev);
 	pci_disable_device(pdev);