~hc/RK356X_SDK_RELEASE.git

..	..	@@ -429,7 +429,6 @@
429	429	struct adapter *adapter = dev->ml_priv;
430	430
431	431	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
432		- strlcpy(info->version, DRV_VERSION, sizeof(info->version));
433	432	strlcpy(info->bus_info, pci_name(adapter->pdev),
434	433	sizeof(info->bus_info));
435	434	}
..	..	@@ -794,6 +793,9 @@
794	793	}
795	794
796	795	static const struct ethtool_ops t1_ethtool_ops = {
	796	+ .supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS \|
	797	+ ETHTOOL_COALESCE_USE_ADAPTIVE_RX \|
	798	+ ETHTOOL_COALESCE_RATE_SAMPLE_INTERVAL,
797	799	.get_drvinfo = get_drvinfo,
798	800	.get_msglevel = get_msglevel,
799	801	.set_msglevel = set_msglevel,
..	..	@@ -984,8 +986,6 @@
984	986	struct adapter *adapter = NULL;
985	987	struct port_info *pi;
986	988
987		- pr_info_once("%s - version %s\n", DRV_DESCRIPTION, DRV_VERSION);
988		-
989	989	err = pci_enable_device(pdev);
990	990	if (err)
991	991	return err;
..	..	@@ -997,17 +997,17 @@
997	997	goto out_disable_pdev;
998	998	}
999	999
1000		- if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
	1000	+ if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
1001	1001	pci_using_dac = 1;
1002	1002
1003		- if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
1004		- pr_err("%s: unable to obtain 64-bit DMA for "
1005		- "consistent allocations\n", pci_name(pdev));
	1003	+ if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
	1004	+ pr_err("%s: unable to obtain 64-bit DMA for coherent allocations\n",
	1005	+ pci_name(pdev));
1006	1006	err = -ENODEV;
1007	1007	goto out_disable_pdev;
1008	1008	}
1009	1009
1010		- } else if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {
	1010	+ } else if ((err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) != 0) {
1011	1011	pr_err("%s: no usable DMA configuration\n", pci_name(pdev));
1012	1012	goto out_disable_pdev;
1013	1013	}