driver: net: fsl-mc: remove unused strcture elements

The phydev structure is present in both ldpaa_eth_priv and wriop_dpmac_info. the phydev in wriop_dpmac_info is not being used As the phydev is created based on phy_addr and bus members of wriop_dpmac_info, it is appropriate to keep phydev in wriop_dpmac_info. Also phy_regs is not being used, therefore remove it Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>

driver: net: fsl-mc: remove unused strcture elements
The phydev structure is present in both ldpaa_eth_priv and wriop_dpmac_info. the phydev in wriop_dpmac_info is not being used As the phydev is created based on phy_addr and bus members of wriop_dpmac_info, it is appropriate to keep phydev in wriop_dpmac_info. Also phy_regs is not being used, therefore remove it Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Pankaj Bansal · Joe Hershberger
1 parent afd6c6b470
Showing 4 changed files with 34 additions and 28 deletions Side-by-side Diff
drivers/net/ldpaa_eth/ldpaa_eth.c
drivers/net/ldpaa_eth/ldpaa_eth.h
drivers/net/ldpaa_eth/ldpaa_wriop.c
include/fsl-mc/ldpaa_wriop.h
@@ -35,7 +35,7 @@
 		return -1;
 	}
  
-	priv->phydev = phydev;
+	wriop_set_phy_dev(priv->dpmac_id, phydev);
  
 	return phy_config(phydev);
 }
@@ -388,6 +388,7 @@
 	struct mii_dev *bus;
 	phy_interface_t enet_if;
 	struct dpni_queue d_queue;
+	struct phy_device *phydev = NULL;
  
 	if (net_dev->state == ETH_STATE_ACTIVE)
 		return 0;
  
  
  
  
  
  
  
@@ -408,38 +409,41 @@
 		goto err_dpmac_setup;
  
 #ifdef CONFIG_PHYLIB
-	if (priv->phydev) {
-		err = phy_startup(priv->phydev);
+	phydev = wriop_get_phy_dev(priv->dpmac_id);
+	if (phydev) {
+		err = phy_startup(phydev);
 		if (err) {
 			printf("%s: Could not initialize\n",
-			       priv->phydev->dev->name);
+			       phydev->dev->name);
 			goto err_dpmac_bind;
 		}
 	}
 #else
-	priv->phydev = (struct phy_device *)malloc(sizeof(struct phy_device));
-	memset(priv->phydev, 0, sizeof(struct phy_device));
+	phydev = (struct phy_device *)malloc(sizeof(struct phy_device));
+	memset(phydev, 0, sizeof(struct phy_device));
+	wriop_set_phy_dev(priv->dpmac_id, phydev);
  
-	priv->phydev->speed = SPEED_1000;
-	priv->phydev->link = 1;
-	priv->phydev->duplex = DUPLEX_FULL;
+	phydev->speed = SPEED_1000;
+	phydev->link = 1;
+	phydev->duplex = DUPLEX_FULL;
 #endif
  
 	bus = wriop_get_mdio(priv->dpmac_id);
 	enet_if = wriop_get_enet_if(priv->dpmac_id);
 	if ((bus == NULL) &&
 	    (enet_if == PHY_INTERFACE_MODE_XGMII)) {
-		priv->phydev = (struct phy_device *)
+		phydev = (struct phy_device *)
 				malloc(sizeof(struct phy_device));
-		memset(priv->phydev, 0, sizeof(struct phy_device));
+		memset(phydev, 0, sizeof(struct phy_device));
+		wriop_set_phy_dev(priv->dpmac_id, phydev);
  
-		priv->phydev->speed = SPEED_10000;
-		priv->phydev->link = 1;
-		priv->phydev->duplex = DUPLEX_FULL;
+		phydev->speed = SPEED_10000;
+		phydev->link = 1;
+		phydev->duplex = DUPLEX_FULL;
 	}
  
-	if (!priv->phydev->link) {
-		printf("%s: No link.\n", priv->phydev->dev->name);
+	if (!phydev->link) {
+		printf("%s: No link.\n", phydev->dev->name);
 		err = -1;
 		goto err_dpmac_bind;
 	}
  
  
  
@@ -476,17 +480,17 @@
 		return err;
 	}
  
-	dpmac_link_state.rate = priv->phydev->speed;
+	dpmac_link_state.rate = phydev->speed;
  
-	if (priv->phydev->autoneg == AUTONEG_DISABLE)
+	if (phydev->autoneg == AUTONEG_DISABLE)
 		dpmac_link_state.options &= ~DPMAC_LINK_OPT_AUTONEG;
 	else
 		dpmac_link_state.options |= DPMAC_LINK_OPT_AUTONEG;
  
-	if (priv->phydev->duplex == DUPLEX_HALF)
+	if (phydev->duplex == DUPLEX_HALF)
 		dpmac_link_state.options |= DPMAC_LINK_OPT_HALF_DUPLEX;
  
-	dpmac_link_state.up = priv->phydev->link;
+	dpmac_link_state.up = phydev->link;
  
 	err = dpmac_set_link_state(dflt_mc_io, MC_CMD_NO_FLAGS,
 				  priv->dpmac_handle, &dpmac_link_state);
@@ -530,7 +534,7 @@
 		goto err_qdid;
 	}
  
-	return priv->phydev->link;
+	return phydev->link;
  
 err_qdid:
 err_get_queue:
@@ -556,6 +560,7 @@
 #ifdef CONFIG_PHYLIB
 	struct mii_dev *bus = wriop_get_mdio(priv->dpmac_id);
 #endif
+	struct phy_device *phydev = NULL;
  
 	if ((net_dev->state == ETH_STATE_PASSIVE) ||
 	    (net_dev->state == ETH_STATE_INIT))
@@ -588,11 +593,12 @@
 		printf("dpni_disable() failed\n");
  
 #ifdef CONFIG_PHYLIB
-	if (priv->phydev && bus != NULL)
-		phy_shutdown(priv->phydev);
-	else {
-		free(priv->phydev);
-		priv->phydev = NULL;
+	phydev = wriop_get_phy_dev(priv->dpmac_id);
+	if (phydev && bus) {
+		phy_shutdown(phydev);
+	} else {
+		free(phydev);
+		wriop_set_phy_dev(priv->dpmac_id, NULL);
 	}
 #endif
  
@@ -127,7 +127,6 @@
 	uint16_t tx_flow_id;
  
 	enum ldpaa_eth_type type;	/* 1G or 10G ethernet */
-	struct phy_device *phydev;
 };
  
 struct dprc_endpoint dpmac_endpoint;
@@ -26,6 +26,7 @@
 	dpmac_info[dpmac_id].enabled = 0;
 	dpmac_info[dpmac_id].id = 0;
 	dpmac_info[dpmac_id].phy_addr = -1;
+	dpmac_info[dpmac_id].phydev = NULL;
 	dpmac_info[dpmac_id].enet_if = PHY_INTERFACE_MODE_NONE;
  
 	enet_if = wriop_dpmac_enet_if(dpmac_id, lane_prtcl);
@@ -42,6 +43,7 @@
 	dpmac_info[dpmac_id].id = dpmac_id;
 	dpmac_info[dpmac_id].phy_addr = -1;
 	dpmac_info[dpmac_id].enet_if = enet_if;
+	dpmac_info[dpmac_id].phydev = NULL;
 }
  
  
@@ -41,7 +41,6 @@
 	u8 id;
 	u8 board_mux;
 	int phy_addr;
-	void *phy_regs;
 	phy_interface_t enet_if;
 	struct phy_device *phydev;
 	struct mii_dev *bus;
...	...	@@ -35,7 +35,7 @@
35	35	return -1;
36	36	}
37	37
38		- priv->phydev = phydev;
	38	+ wriop_set_phy_dev(priv->dpmac_id, phydev);
39	39
40	40	return phy_config(phydev);
41	41	}
...	...	@@ -388,6 +388,7 @@
388	388	struct mii_dev *bus;
389	389	phy_interface_t enet_if;
390	390	struct dpni_queue d_queue;
	391	+ struct phy_device *phydev = NULL;
391	392
392	393	if (net_dev->state == ETH_STATE_ACTIVE)
393	394	return 0;
394	395
395	396
396	397
397	398
398	399
399	400
400	401
...	...	@@ -408,38 +409,41 @@
408	409	goto err_dpmac_setup;
409	410
410	411	#ifdef CONFIG_PHYLIB
411		- if (priv->phydev) {
412		- err = phy_startup(priv->phydev);
	412	+ phydev = wriop_get_phy_dev(priv->dpmac_id);
	413	+ if (phydev) {
	414	+ err = phy_startup(phydev);
413	415	if (err) {
414	416	printf("%s: Could not initialize\n",
415		- priv->phydev->dev->name);
	417	+ phydev->dev->name);
416	418	goto err_dpmac_bind;
417	419	}
418	420	}
419	421	#else
420		- priv->phydev = (struct phy_device *)malloc(sizeof(struct phy_device));
421		- memset(priv->phydev, 0, sizeof(struct phy_device));
	422	+ phydev = (struct phy_device *)malloc(sizeof(struct phy_device));
	423	+ memset(phydev, 0, sizeof(struct phy_device));
	424	+ wriop_set_phy_dev(priv->dpmac_id, phydev);
422	425
423		- priv->phydev->speed = SPEED_1000;
424		- priv->phydev->link = 1;
425		- priv->phydev->duplex = DUPLEX_FULL;
	426	+ phydev->speed = SPEED_1000;
	427	+ phydev->link = 1;
	428	+ phydev->duplex = DUPLEX_FULL;
426	429	#endif
427	430
428	431	bus = wriop_get_mdio(priv->dpmac_id);
429	432	enet_if = wriop_get_enet_if(priv->dpmac_id);
430	433	if ((bus == NULL) &&
431	434	(enet_if == PHY_INTERFACE_MODE_XGMII)) {
432		- priv->phydev = (struct phy_device *)
	435	+ phydev = (struct phy_device *)
433	436	malloc(sizeof(struct phy_device));
434		- memset(priv->phydev, 0, sizeof(struct phy_device));
	437	+ memset(phydev, 0, sizeof(struct phy_device));
	438	+ wriop_set_phy_dev(priv->dpmac_id, phydev);
435	439
436		- priv->phydev->speed = SPEED_10000;
437		- priv->phydev->link = 1;
438		- priv->phydev->duplex = DUPLEX_FULL;
	440	+ phydev->speed = SPEED_10000;
	441	+ phydev->link = 1;
	442	+ phydev->duplex = DUPLEX_FULL;
439	443	}
440	444
441		- if (!priv->phydev->link) {
442		- printf("%s: No link.\n", priv->phydev->dev->name);
	445	+ if (!phydev->link) {
	446	+ printf("%s: No link.\n", phydev->dev->name);
443	447	err = -1;
444	448	goto err_dpmac_bind;
445	449	}
446	450
447	451
448	452
...	...	@@ -476,17 +480,17 @@
476	480	return err;
477	481	}
478	482
479		- dpmac_link_state.rate = priv->phydev->speed;
	483	+ dpmac_link_state.rate = phydev->speed;
480	484
481		- if (priv->phydev->autoneg == AUTONEG_DISABLE)
	485	+ if (phydev->autoneg == AUTONEG_DISABLE)
482	486	dpmac_link_state.options &= ~DPMAC_LINK_OPT_AUTONEG;
483	487	else
484	488	dpmac_link_state.options \|= DPMAC_LINK_OPT_AUTONEG;
485	489
486		- if (priv->phydev->duplex == DUPLEX_HALF)
	490	+ if (phydev->duplex == DUPLEX_HALF)
487	491	dpmac_link_state.options \|= DPMAC_LINK_OPT_HALF_DUPLEX;
488	492
489		- dpmac_link_state.up = priv->phydev->link;
	493	+ dpmac_link_state.up = phydev->link;
490	494
491	495	err = dpmac_set_link_state(dflt_mc_io, MC_CMD_NO_FLAGS,
492	496	priv->dpmac_handle, &dpmac_link_state);
...	...	@@ -530,7 +534,7 @@
530	534	goto err_qdid;
531	535	}
532	536
533		- return priv->phydev->link;
	537	+ return phydev->link;
534	538
535	539	err_qdid:
536	540	err_get_queue:
...	...	@@ -556,6 +560,7 @@
556	560	#ifdef CONFIG_PHYLIB
557	561	struct mii_dev *bus = wriop_get_mdio(priv->dpmac_id);
558	562	#endif
	563	+ struct phy_device *phydev = NULL;
559	564
560	565	if ((net_dev->state == ETH_STATE_PASSIVE) \|\|
561	566	(net_dev->state == ETH_STATE_INIT))
...	...	@@ -588,11 +593,12 @@
588	593	printf("dpni_disable() failed\n");
589	594
590	595	#ifdef CONFIG_PHYLIB
591		- if (priv->phydev && bus != NULL)
592		- phy_shutdown(priv->phydev);
593		- else {
594		- free(priv->phydev);
595		- priv->phydev = NULL;
	596	+ phydev = wriop_get_phy_dev(priv->dpmac_id);
	597	+ if (phydev && bus) {
	598	+ phy_shutdown(phydev);
	599	+ } else {
	600	+ free(phydev);
	601	+ wriop_set_phy_dev(priv->dpmac_id, NULL);
596	602	}
597	603	#endif
598	604
...	...	@@ -127,7 +127,6 @@
127	127	uint16_t tx_flow_id;
128	128
129	129	enum ldpaa_eth_type type; /* 1G or 10G ethernet */
130		- struct phy_device *phydev;
131	130	};
132	131
133	132	struct dprc_endpoint dpmac_endpoint;
...	...	@@ -26,6 +26,7 @@
26	26	dpmac_info[dpmac_id].enabled = 0;
27	27	dpmac_info[dpmac_id].id = 0;
28	28	dpmac_info[dpmac_id].phy_addr = -1;
	29	+ dpmac_info[dpmac_id].phydev = NULL;
29	30	dpmac_info[dpmac_id].enet_if = PHY_INTERFACE_MODE_NONE;
30	31
31	32	enet_if = wriop_dpmac_enet_if(dpmac_id, lane_prtcl);
...	...	@@ -42,6 +43,7 @@
42	43	dpmac_info[dpmac_id].id = dpmac_id;
43	44	dpmac_info[dpmac_id].phy_addr = -1;
44	45	dpmac_info[dpmac_id].enet_if = enet_if;
	46	+ dpmac_info[dpmac_id].phydev = NULL;
45	47	}
46	48
47	49
...	...	@@ -41,7 +41,6 @@
41	41	u8 id;
42	42	u8 board_mux;
43	43	int phy_addr;
44		- void *phy_regs;
45	44	phy_interface_t enet_if;
46	45	struct phy_device *phydev;
47	46	struct mii_dev *bus;