Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80721e7f authored by Philippe Reynes's avatar Philippe Reynes Committed by David S. Miller
Browse files

net: ethernet: pasemi_mac: use phydev from struct net_device 



The private structure contain a pointer to phydev, but the structure
net_device already contain such pointer. So we can remove the pointer
phy in the private structure, and update the driver to use the
one contained in struct net_device.

Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e384840

drivers/net/ethernet/pasemi/pasemi_mac.c

+13 −15
Original line number Original line Diff line number Diff line
@@ -989,7 +989,7 @@ static void pasemi_adjust_link(struct net_device *dev) 
	unsigned int flags;

	unsigned int flags;

	unsigned int new_flags;

	unsigned int new_flags;





	if (!mac->phydev->link) {

	if (!dev->phydev->link) {

		/* If no link, MAC speed settings don't matter. Just report

		/* If no link, MAC speed settings don't matter. Just report

		 * link down and return.

		 * link down and return.

		 */

		 */
@@ -1010,10 +1010,10 @@ static void pasemi_adjust_link(struct net_device *dev) 
	new_flags = flags & ~(PAS_MAC_CFG_PCFG_HD | PAS_MAC_CFG_PCFG_SPD_M |

	new_flags = flags & ~(PAS_MAC_CFG_PCFG_HD | PAS_MAC_CFG_PCFG_SPD_M |

			      PAS_MAC_CFG_PCFG_TSR_M);

			      PAS_MAC_CFG_PCFG_TSR_M);





	if (!mac->phydev->duplex)

	if (!dev->phydev->duplex)

		new_flags |= PAS_MAC_CFG_PCFG_HD;

		new_flags |= PAS_MAC_CFG_PCFG_HD;





	switch (mac->phydev->speed) {

	switch (dev->phydev->speed) {

	case 1000:

	case 1000:

		new_flags |= PAS_MAC_CFG_PCFG_SPD_1G |

		new_flags |= PAS_MAC_CFG_PCFG_SPD_1G |

			     PAS_MAC_CFG_PCFG_TSR_1G;

			     PAS_MAC_CFG_PCFG_TSR_1G;
@@ -1027,15 +1027,15 @@ static void pasemi_adjust_link(struct net_device *dev) 
			     PAS_MAC_CFG_PCFG_TSR_10M;

			     PAS_MAC_CFG_PCFG_TSR_10M;

		break;

		break;

	default:

	default:

		printk("Unsupported speed %d\n", mac->phydev->speed);

		printk("Unsupported speed %d\n", dev->phydev->speed);

	}

	}





	/* Print on link or speed/duplex change */

	/* Print on link or speed/duplex change */

	msg = mac->link != mac->phydev->link || flags != new_flags;

	msg = mac->link != dev->phydev->link || flags != new_flags;





	mac->duplex = mac->phydev->duplex;

	mac->duplex = dev->phydev->duplex;

	mac->speed = mac->phydev->speed;

	mac->speed = dev->phydev->speed;

	mac->link = mac->phydev->link;

	mac->link = dev->phydev->link;





	if (new_flags != flags)

	if (new_flags != flags)

		write_mac_reg(mac, PAS_MAC_CFG_PCFG, new_flags);

		write_mac_reg(mac, PAS_MAC_CFG_PCFG, new_flags);
@@ -1067,8 +1067,6 @@ static int pasemi_mac_phy_init(struct net_device *dev) 
		return -ENODEV;

		return -ENODEV;

	}

	}





	mac->phydev = phydev;



	return 0;

	return 0;

}

}
@@ -1198,8 +1196,8 @@ static int pasemi_mac_open(struct net_device *dev) 
		goto out_rx_int;

		goto out_rx_int;

	}

	}





	if (mac->phydev)

	if (dev->phydev)

		phy_start(mac->phydev);

		phy_start(dev->phydev);





	setup_timer(&mac->tx->clean_timer, pasemi_mac_tx_timer,

	setup_timer(&mac->tx->clean_timer, pasemi_mac_tx_timer,

		    (unsigned long)mac->tx);

		    (unsigned long)mac->tx);
@@ -1293,9 +1291,9 @@ static int pasemi_mac_close(struct net_device *dev) 
	rxch = rx_ring(mac)->chan.chno;

	rxch = rx_ring(mac)->chan.chno;

	txch = tx_ring(mac)->chan.chno;

	txch = tx_ring(mac)->chan.chno;





	if (mac->phydev) {

	if (dev->phydev) {

		phy_stop(mac->phydev);

		phy_stop(dev->phydev);

		phy_disconnect(mac->phydev);

		phy_disconnect(dev->phydev);

	}

	}





	del_timer_sync(&mac->tx->clean_timer);

	del_timer_sync(&mac->tx->clean_timer);

drivers/net/ethernet/pasemi/pasemi_mac.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,6 @@ struct pasemi_mac { 
	struct pci_dev *pdev;

	struct pci_dev *pdev;

	struct pci_dev *dma_pdev;

	struct pci_dev *dma_pdev;

	struct pci_dev *iob_pdev;

	struct pci_dev *iob_pdev;

	struct phy_device *phydev;

	struct napi_struct napi;

	struct napi_struct napi;





	int		bufsz; /* RX ring buffer size */

	int		bufsz; /* RX ring buffer size */

drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -66,8 +66,7 @@ static int 
pasemi_mac_ethtool_get_settings(struct net_device *netdev,

pasemi_mac_ethtool_get_settings(struct net_device *netdev,

			       struct ethtool_cmd *cmd)

			       struct ethtool_cmd *cmd)

{

{

	struct pasemi_mac *mac = netdev_priv(netdev);

	struct phy_device *phydev = netdev->phydev;

	struct phy_device *phydev = mac->phydev;





	if (!phydev)

	if (!phydev)

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;
@@ -79,8 +78,7 @@ static int 
pasemi_mac_ethtool_set_settings(struct net_device *netdev,

pasemi_mac_ethtool_set_settings(struct net_device *netdev,

			       struct ethtool_cmd *cmd)

			       struct ethtool_cmd *cmd)

{

{

	struct pasemi_mac *mac = netdev_priv(netdev);

	struct phy_device *phydev = netdev->phydev;

	struct phy_device *phydev = mac->phydev;





	if (!phydev)

	if (!phydev)

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;