forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-08 01573e231f18eb2d99162747186f59511f56b64d 
 kernel/drivers/net/ethernet/sun/niu.c
....@@ -429,7 +429,7 @@
429429 	struct niu_link_config *lp = &np->link_config;
430430 	u16 pll_cfg, pll_sts;
431431 	int max_retry = 100;
432
-	u64 uninitialized_var(sig), mask, val;
432
+	u64 sig, mask, val;
433433 	u32 tx_cfg, rx_cfg;
434434 	unsigned long i;
435435 	int err;
....@@ -526,7 +526,7 @@
526526 	struct niu_link_config *lp = &np->link_config;
527527 	u32 tx_cfg, rx_cfg, pll_cfg, pll_sts;
528528 	int max_retry = 100;
529
-	u64 uninitialized_var(sig), mask, val;
529
+	u64 sig, mask, val;
530530 	unsigned long i;
531531 	int err;
532532 
....@@ -714,7 +714,7 @@
714714 
715715 static int esr_reset(struct niu *np)
716716 {
717
-	u32 uninitialized_var(reset);
717
+	u32 reset;
718718 	int err;
719719 
720720 	err = mdio_write(np, np->port, NIU_ESR_DEV_ADDR,
....@@ -1216,8 +1216,6 @@
12161216 	current_duplex = DUPLEX_INVALID;
12171217 
12181218 	spin_lock_irqsave(&np->lock, flags);
1219
-
1220
-	err = -EINVAL;
12211219 
12221220 	err = mii_read(np, np->phy_addr, MII_BMSR);
12231221 	if (err < 0)
....@@ -6517,7 +6515,7 @@
65176515 	spin_unlock_irqrestore(&np->lock, flags);
65186516 }
65196517 
6520
-static void niu_tx_timeout(struct net_device *dev)
6518
+static void niu_tx_timeout(struct net_device *dev, unsigned int txqueue)
65216519 {
65226520 	struct niu *np = netdev_priv(dev);
65236521 
....@@ -6695,7 +6693,7 @@
66956693 
66966694 		len = skb_frag_size(frag);
66976695 		mapping = np->ops->map_page(np->device, skb_frag_page(frag),
6698
-					    frag->page_offset, len,
6696
+					    skb_frag_off(frag), len,
66996697 					    DMA_TO_DEVICE);
67006698 
67016699 		rp->tx_buffs[prod].skb = NULL;
....@@ -7462,6 +7460,7 @@
74627460 					class = CLASS_CODE_USER_PROG4;
74637461 					break;
74647462 				default:
7463
+					class = CLASS_CODE_UNRECOG;
74657464 					break;
74667465 				}
74677466 				ret = tcam_user_ip_class_set(np, class, 0,
....@@ -8840,7 +8839,7 @@
88408839 			else
88418840 				goto unknown_vg_1g_port;
88428841 
8843
-			/* fallthru */
8842
+			fallthrough;
88448843 		case 0x22:
88458844 			val = (phy_encode(PORT_TYPE_10G, 0) |
88468845 			       phy_encode(PORT_TYPE_10G, 1) |
....@@ -8865,7 +8864,7 @@
88658864 			else
88668865 				goto unknown_vg_1g_port;
88678866 
8868
-			/* fallthru */
8867
+			fallthrough;
88698868 		case 0x13:
88708869 			if ((lowest_10g & 0x7) == 0)
88718870 				val = (phy_encode(PORT_TYPE_10G, 0) |
....@@ -9881,9 +9880,9 @@
98819880 	}
98829881 }
98839882 
9884
-static int niu_suspend(struct pci_dev *pdev, pm_message_t state)
9883
+static int __maybe_unused niu_suspend(struct device *dev_d)
98859884 {
9886
-	struct net_device *dev = pci_get_drvdata(pdev);
9885
+	struct net_device *dev = dev_get_drvdata(dev_d);
98879886 	struct niu *np = netdev_priv(dev);
98889887 	unsigned long flags;
98899888 
....@@ -9905,22 +9904,18 @@
99059904 	niu_stop_hw(np);
99069905 	spin_unlock_irqrestore(&np->lock, flags);
99079906 
9908
-	pci_save_state(pdev);
9909
-
99109907 	return 0;
99119908 }
99129909 
9913
-static int niu_resume(struct pci_dev *pdev)
9910
+static int __maybe_unused niu_resume(struct device *dev_d)
99149911 {
9915
-	struct net_device *dev = pci_get_drvdata(pdev);
9912
+	struct net_device *dev = dev_get_drvdata(dev_d);
99169913 	struct niu *np = netdev_priv(dev);
99179914 	unsigned long flags;
99189915 	int err;
99199916 
99209917 	if (!netif_running(dev))
99219918 		return 0;
9922
-
9923
-	pci_restore_state(pdev);
99249919 
99259920 	netif_device_attach(dev);
99269921 
....@@ -9938,13 +9933,14 @@
99389933 	return err;
99399934 }
99409935 
9936
+static SIMPLE_DEV_PM_OPS(niu_pm_ops, niu_suspend, niu_resume);
9937
+
99419938 static struct pci_driver niu_pci_driver = {
99429939 	.name		= DRV_MODULE_NAME,
99439940 	.id_table	= niu_pci_tbl,
99449941 	.probe		= niu_pci_init_one,
99459942 	.remove		= niu_pci_remove_one,
9946
-	.suspend	= niu_suspend,
9947
-	.resume		= niu_resume,
9943
+	.driver.pm	= &niu_pm_ops,
99489944 };
99499945 
99509946 #ifdef CONFIG_SPARC64