1 files changed, 6 insertions, 26 deletions

diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h
index 38a99350832..dd2e44fba63 100644
--- a/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
@@ -21,8 +21,6 @@
 #ifndef _PTP_CLOCK_KERNEL_H_
 #define _PTP_CLOCK_KERNEL_H_
 
-#include <linux/device.h>
-#include <linux/pps_kernel.h>
 #include <linux/ptp_clock.h>
 
 
@@ -42,9 +40,7 @@ struct ptp_clock_request {
  * struct ptp_clock_info - decribes a PTP hardware clock
  *
  * @owner:     The clock driver should set to THIS_MODULE.
- * @name:      A short "friendly name" to identify the clock and to
- *             help distinguish PHY based devices from MAC based ones.
- *             The string is not meant to be a unique id.
+ * @name:      A short name to identify the clock.
  * @max_adj:   The maximum possible frequency adjustment, in parts per billon.
  * @n_alarm:   The number of programmable alarms.
  * @n_ext_ts:  The number of external time stamp channels.
@@ -54,8 +50,7 @@ struct ptp_clock_request {
  * clock operations
  *
  * @adjfreq:  Adjusts the frequency of the hardware clock.
- *            parameter delta: Desired frequency offset from nominal frequency
- *            in parts per billion
+ *            parameter delta: Desired period change in parts per billion.
  *
  * @adjtime:  Shifts the time of the hardware clock.
  *            parameter delta: Desired change in nanoseconds.
@@ -97,12 +92,10 @@ struct ptp_clock;
 /**
  * ptp_clock_register() - register a PTP hardware clock driver
  *
- * @info:   Structure describing the new clock.
- * @parent: Pointer to the parent device of the new clock.
+ * @info:  Structure describing the new clock.
  */
 
-extern struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
-                                            struct device *parent);
+extern struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info);
 
 /**
  * ptp_clock_unregister() - unregister a PTP hardware clock driver
@@ -117,7 +110,6 @@ enum ptp_clock_events {
         PTP_CLOCK_ALARM,
         PTP_CLOCK_EXTTS,
         PTP_CLOCK_PPS,
-        PTP_CLOCK_PPSUSR,
 };
 
 /**
@@ -125,17 +117,13 @@ enum ptp_clock_events {
  *
  * @type:  One of the ptp_clock_events enumeration values.
  * @index: Identifies the source of the event.
- * @timestamp: When the event occurred (%PTP_CLOCK_EXTTS only).
- * @pps_times: When the event occurred (%PTP_CLOCK_PPSUSR only).
+ * @timestamp: When the event occured.
  */
 
 struct ptp_clock_event {
         int type;
         int index;
-        union {
-                u64 timestamp;
-                struct pps_event_time pps_times;
-        };
+        u64 timestamp;
 };
 
 /**
@@ -148,12 +136,4 @@ struct ptp_clock_event {
 extern void ptp_clock_event(struct ptp_clock *ptp,
                             struct ptp_clock_event *event);
 
-/**
- * ptp_clock_index() - obtain the device index of a PTP clock
- *
- * @ptp:    The clock obtained from ptp_clock_register().
- */
-
-extern int ptp_clock_index(struct ptp_clock *ptp);
-
 #endif