8 files changed, 13 insertions, 9 deletions

diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index c08e5d40fecb..18762a3ccce4 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -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;
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c
index e13ba1d5369f..ee21445157a3 100644
--- a/drivers/net/ethernet/intel/igb/igb_ptp.c
+++ b/drivers/net/ethernet/intel/igb/igb_ptp.c
@@ -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");
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index 3456d5617143..39881cb17a4b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -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");
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
index 2b07a4eae07e..5b3dd028ce85 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -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;
 
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index b0da0226661f..24e05c43bff8 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -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;
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index c470ddf1a6fa..79f4bce061bd 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -182,7 +182,8 @@ static void delete_ptp_clock(struct posix_clock *pc)
 
 /* public interface */
 
-struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info)
+struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
+                                     struct device *parent)
 {
         struct ptp_clock *ptp;
         int err = 0, index, major = MAJOR(ptp_devt);
@@ -215,7 +216,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info)
         init_waitqueue_head(&ptp->tsev_wq);
 
         /* Create a new device in our class. */
-        ptp->dev = device_create(ptp_class, NULL, ptp->devid, ptp,
+        ptp->dev = device_create(ptp_class, parent, ptp->devid, ptp,
                                  "ptp%d", ptp->index);
         if (IS_ERR(ptp->dev))
                 goto no_device;
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c
index e03c40692b00..d49b85164fd2 100644
--- a/drivers/ptp/ptp_ixp46x.c
+++ b/drivers/ptp/ptp_ixp46x.c
@@ -298,7 +298,7 @@ static int __init ptp_ixp_init(void)
 
         ixp_clock.caps = ptp_ixp_caps;
 
-        ixp_clock.ptp_clock = ptp_clock_register(&ixp_clock.caps);
+        ixp_clock.ptp_clock = ptp_clock_register(&ixp_clock.caps, NULL);
 
         if (IS_ERR(ixp_clock.ptp_clock))
                 return PTR_ERR(ixp_clock.ptp_clock);
diff --git a/drivers/ptp/ptp_pch.c b/drivers/ptp/ptp_pch.c
index 3a9c17eced10..e624e4dd2abb 100644
--- a/drivers/ptp/ptp_pch.c
+++ b/drivers/ptp/ptp_pch.c
@@ -627,7 +627,7 @@ pch_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         chip->caps = ptp_pch_caps;
-        chip->ptp_clock = ptp_clock_register(&chip->caps);
+        chip->ptp_clock = ptp_clock_register(&chip->caps, &pdev->dev);
 
         if (IS_ERR(chip->ptp_clock))
                 return PTR_ERR(chip->ptp_clock);