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

Commit 1ef76158 authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller
Browse files

ptp: link the phc device to its parent device 



PTP Hardware Clock devices appear as class devices in sysfs. This patch
changes the registration API to use the parent device, clarifying the
clock's relationship to the underlying device.

Signed-off-by: default avatarRichard Cochran <richardcochran@gmail.com>
Acked-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c35bad5

drivers/net/ethernet/freescale/gianfar_ptp.c

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static int gianfar_ptp_probe(struct platform_device *dev) 


	spin_unlock_irqrestore(&etsects->lock, flags);



	etsects->clock = ptp_clock_register(&etsects->caps);

	etsects->clock = ptp_clock_register(&etsects->caps, &dev->dev);

	if (IS_ERR(etsects->clock)) {

		err = PTR_ERR(etsects->clock);

		goto no_clock;

drivers/net/ethernet/intel/igb/igb_ptp.c

+2 −1
Original line number Diff line number Diff line
@@ -752,7 +752,8 @@ void igb_ptp_init(struct igb_adapter *adapter) 
		wr32(E1000_IMS, E1000_IMS_TS);

	}



	adapter->ptp_clock = ptp_clock_register(&adapter->ptp_caps);

	adapter->ptp_clock = ptp_clock_register(&adapter->ptp_caps,

						&adapter->pdev->dev);

	if (IS_ERR(adapter->ptp_clock)) {

		adapter->ptp_clock = NULL;

		dev_err(&adapter->pdev->dev, "ptp_clock_register failed\n");

drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

+2 −1
Original line number Diff line number Diff line
@@ -960,7 +960,8 @@ void ixgbe_ptp_init(struct ixgbe_adapter *adapter) 
	/* (Re)start the overflow check */

	adapter->flags2 |= IXGBE_FLAG2_OVERFLOW_CHECK_ENABLED;



	adapter->ptp_clock = ptp_clock_register(&adapter->ptp_caps);

	adapter->ptp_clock = ptp_clock_register(&adapter->ptp_caps,

						&adapter->pdev->dev);

	if (IS_ERR(adapter->ptp_clock)) {

		adapter->ptp_clock = NULL;

		e_dev_err("ptp_clock_register failed\n");

drivers/net/ethernet/sfc/ptp.c

+2 −1
Original line number Diff line number Diff line
@@ -931,7 +931,8 @@ static int efx_ptp_probe_channel(struct efx_channel *channel) 
	ptp->phc_clock_info.settime = efx_phc_settime;

	ptp->phc_clock_info.enable = efx_phc_enable;



	ptp->phc_clock = ptp_clock_register(&ptp->phc_clock_info);

	ptp->phc_clock = ptp_clock_register(&ptp->phc_clock_info,

					    &efx->pci_dev->dev);

	if (!ptp->phc_clock)

		goto fail3;

drivers/net/phy/dp83640.c

+1 −1
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ static int dp83640_probe(struct phy_device *phydev) 


	if (choose_this_phy(clock, phydev)) {

		clock->chosen = dp83640;

		clock->ptp_clock = ptp_clock_register(&clock->caps);

		clock->ptp_clock = ptp_clock_register(&clock->caps, &phydev->dev);

		if (IS_ERR(clock->ptp_clock)) {

			err = PTR_ERR(clock->ptp_clock);

			goto no_register;