r8169: improve a check in rtl_init_one

The check for pci_is_pcie() is redundant here because all
chip versions >=18 are PCIe only anyway. In addition use
dma_set_mask_and_coherent() instead of separate calls to
pci_set_dma_mask() and pci_set_consistent_dma_mask().

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 2d9e6c186ed7ff32b24de14ae764be9d4aaaac86..f882be49f493749b34f939b5c12d7999907f9f08 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7346,11 +7346,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        tp->cp_cmd = RTL_R16(tp, CPlusCmd);
 
-       if ((sizeof(dma_addr_t) > 4) &&
-           (use_dac == 1 || (use_dac == -1 && pci_is_pcie(pdev) &&
-                             tp->mac_version >= RTL_GIGA_MAC_VER_18)) &&
-           !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
-           !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
+       if (sizeof(dma_addr_t) > 4 && (use_dac == 1 || (use_dac == -1 &&
+           tp->mac_version >= RTL_GIGA_MAC_VER_18)) &&
+           !dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) {
 
                /* CPlusCmd Dual Access Cycle is only needed for non-PCIe */
                if (!pci_is_pcie(pdev))