~hc/RK356X_SDK_RELEASE.git

..	..	@@ -33,7 +33,6 @@
33	33	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
34	34
35	35	#include <linux/module.h>
36		-#include <linux/moduleparam.h>
37	36	#include <linux/init.h>
38	37	#include <linux/pci.h>
39	38	#include <linux/dma-mapping.h>
..	..	@@ -106,7 +105,6 @@
106	105	MODULE_DESCRIPTION(DRV_DESC);
107	106	MODULE_AUTHOR("Chelsio Communications");
108	107	MODULE_LICENSE("Dual BSD/GPL");
109		-MODULE_VERSION(DRV_VERSION);
110	108	MODULE_DEVICE_TABLE(pci, cxgb3_pci_tbl);
111	109
112	110	static int dflt_msg_enable = DFLT_MSG_ENABLE;
..	..	@@ -150,7 +148,7 @@
150	148
151	149	/**
152	150	* link_report - show link status and link speed/duplex
153		- * @p: the port whose settings are to be reported
	151	+ * @dev: the port whose settings are to be reported
154	152	*
155	153	* Shows the link status, speed, and duplex of a port.
156	154	*/
..	..	@@ -306,8 +304,8 @@
306	304
307	305	/**
308	306	* t3_os_phymod_changed - handle PHY module changes
309		- * @phy: the PHY reporting the module change
310		- * @mod_type: new module type
	307	+ * @adap: the adapter associated with the link change
	308	+ * @port_id: the port index whose limk status has changed
311	309	*
312	310	* This is the OS-dependent handler for PHY module changes. It is
313	311	* invoked when a PHY module is removed or inserted for any OS-specific
..	..	@@ -1202,7 +1200,7 @@
1202	1200
1203	1201	/**
1204	1202	* cxgb_up - enable the adapter
1205		- * @adapter: adapter being enabled
	1203	+ * @adap: adapter being enabled
1206	1204	*
1207	1205	* Called when the first port is enabled, this function performs the
1208	1206	* actions necessary to make an adapter operational, such as completing
..	..	@@ -1304,6 +1302,7 @@
1304	1302	if (ret < 0) {
1305	1303	CH_ERR(adap, "failed to bind qsets, err %d\n", ret);
1306	1304	t3_intr_disable(adap);
	1305	+ quiesce_rx(adap);
1307	1306	free_irq_resources(adap);
1308	1307	err = ret;
1309	1308	goto out;
..	..	@@ -1630,7 +1629,6 @@
1630	1629	spin_unlock(&adapter->stats_lock);
1631	1630
1632	1631	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
1633		- strlcpy(info->version, DRV_VERSION, sizeof(info->version));
1634	1632	strlcpy(info->bus_info, pci_name(adapter->pdev),
1635	1633	sizeof(info->bus_info));
1636	1634	if (fw_vers)
..	..	@@ -2107,6 +2105,7 @@
2107	2105	}
2108	2106
2109	2107	static const struct ethtool_ops cxgb_ethtool_ops = {
	2108	+ .supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS,
2110	2109	.get_drvinfo = get_drvinfo,
2111	2110	.get_msglevel = get_msglevel,
2112	2111	.set_msglevel = set_msglevel,
..	..	@@ -2545,7 +2544,7 @@
2545	2544	!(data->phy_id & 0xe0e0))
2546	2545	data->phy_id = mdio_phy_id_c45(data->phy_id >> 8,
2547	2546	data->phy_id & 0x1f);
2548		- /* FALLTHRU */
	2547	+ fallthrough;
2549	2548	case SIOCGMIIPHY:
2550	2549	return mdio_mii_ioctl(&pi->phy.mdio, data, cmd);
2551	2550	case SIOCCHIOCTL:
..	..	@@ -2998,7 +2997,7 @@
2998	2997	unsigned int fw_status[4];
2999	2998
3000	2999	if (adapter->flags & FULL_INIT_DONE) {
3001		- t3_sge_stop(adapter);
	3000	+ t3_sge_stop_dma(adapter);
3002	3001	t3_write_reg(adapter, A_XGM_TX_CTRL, 0);
3003	3002	t3_write_reg(adapter, A_XGM_RX_CTRL, 0);
3004	3003	t3_write_reg(adapter, XGM_REG(A_XGM_TX_CTRL, 1), 0);
..	..	@@ -3211,8 +3210,6 @@
3211	3210	struct adapter *adapter = NULL;
3212	3211	struct port_info *pi;
3213	3212
3214		- pr_info_once("%s - version %s\n", DRV_DESC, DRV_VERSION);
3215		-
3216	3213	if (!cxgb3_wq) {
3217	3214	cxgb3_wq = create_singlethread_workqueue(DRV_NAME);
3218	3215	if (!cxgb3_wq) {
..	..	@@ -3268,7 +3265,7 @@
3268	3265	goto out_free_adapter;
3269	3266	}
3270	3267
3271		- adapter->regs = ioremap_nocache(mmio_start, mmio_len);
	3268	+ adapter->regs = ioremap(mmio_start, mmio_len);
3272	3269	if (!adapter->regs) {
3273	3270	dev_err(&pdev->dev, "cannot map device registers\n");
3274	3271	err = -ENOMEM;
..	..	@@ -3445,8 +3442,7 @@
3445	3442	free_netdev(adapter->port[i]);
3446	3443
3447	3444	iounmap(adapter->regs);
3448		- if (adapter->nofail_skb)
3449		- kfree_skb(adapter->nofail_skb);
	3445	+ kfree_skb(adapter->nofail_skb);
3450	3446	kfree(adapter);
3451	3447	pci_release_regions(pdev);
3452	3448	pci_disable_device(pdev);