mlx4: bnx2x: Use pci_set_bus_master()
authorBarret Rhoden <brho@cs.berkeley.edu>
Wed, 1 Nov 2017 19:26:07 +0000 (15:26 -0400)
committerBarret Rhoden <brho@cs.berkeley.edu>
Thu, 16 Nov 2017 15:46:55 +0000 (10:46 -0500)
Instead of the #define.  There will be an spatch for this.

Signed-off-by: Barret Rhoden <brho@cs.berkeley.edu>
kern/drivers/net/bnx2x/bnx2x_main.c
kern/drivers/net/mlx4/main.c

index 0ac3e12..e4cf3f9 100644 (file)
@@ -12823,11 +12823,11 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_device *pdev,
                        goto err_out_disable;
                }
 
-               pci_set_master(pdev);
+               pci_set_bus_master(pdev);
                pci_save_state(pdev);
        }
 #else
-               pci_set_master(pdev);
+               pci_set_bus_master(pdev);
 #endif
 
 #if 0 // AKAROS_PORT  We can probably do these
@@ -13778,7 +13778,7 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_device *pdev)
                return PCI_ERS_RESULT_DISCONNECT;
        }
 
-       pci_set_master(pdev);
+       pci_set_bus_master(pdev);
        pci_restore_state(pdev);
        pci_save_state(pdev);
 
index 2d5367e..e03881d 100644 (file)
@@ -3326,7 +3326,7 @@ static int __mlx4_init_one(struct pci_device *pdev, int pci_dev_data,
                goto err_disable_pdev;
        }
 
-       pci_set_master(pdev);
+       pci_set_bus_master(pdev);
 
        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
        if (err) {
@@ -3706,7 +3706,7 @@ static pci_ers_result_t mlx4_pci_slot_reset(struct pci_device *pdev)
                return PCI_ERS_RESULT_DISCONNECT;
        }
 
-       pci_set_master(pdev);
+       pci_set_bus_master(pdev);
        pci_restore_state(pdev);
        pci_save_state(pdev);