diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2017-09-08 19:17:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-08 21:26:51 -0400 |
| commit | a2d818030135c293f878fbb772cf40e7a14c5acc (patch) | |
| tree | af11559c0850ae981c5111ce65db42bed117eaca /include/linux/pps_kernel.h | |
| parent | f22ef333c32cc683922d7e3361a83ebc31b2ac6d (diff) | |
drivers/pps: aesthetic tweaks to PPS-related content
Collection of aesthetic adjustments to various PPS-related files,
directories and Documentation, some quite minor just for the sake of
consistency, including:
* Updated example of pps device tree node (courtesy Rodolfo G.)
* "PPS-API" -> "PPS API"
* "pps_source_info_s" -> "pps_source_info"
* "ktimer driver" -> "pps-ktimer driver"
* "ppstest /dev/pps0" -> "ppstest /dev/pps1" to match example
* Add missing PPS-related entries to MAINTAINERS file
* Other trivialities
Link: http://lkml.kernel.org/r/alpine.LFD.2.20.1708261048220.8106@localhost.localdomain
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Acked-by: Rodolfo Giometti <giometti@enneenne.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/pps_kernel.h')
| -rw-r--r-- | include/linux/pps_kernel.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h index 35ac903956c7..80a980cc8d95 100644 --- a/include/linux/pps_kernel.h +++ b/include/linux/pps_kernel.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #define LINUX_PPS_KERNEL_H | 22 | #define LINUX_PPS_KERNEL_H |
| 23 | 23 | ||
| 24 | #include <linux/pps.h> | 24 | #include <linux/pps.h> |
| 25 | |||
| 26 | #include <linux/cdev.h> | 25 | #include <linux/cdev.h> |
| 27 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 28 | #include <linux/time.h> | 27 | #include <linux/time.h> |
| @@ -35,9 +34,9 @@ struct pps_device; | |||
| 35 | 34 | ||
| 36 | /* The specific PPS source info */ | 35 | /* The specific PPS source info */ |
| 37 | struct pps_source_info { | 36 | struct pps_source_info { |
| 38 | char name[PPS_MAX_NAME_LEN]; /* simbolic name */ | 37 | char name[PPS_MAX_NAME_LEN]; /* symbolic name */ |
| 39 | char path[PPS_MAX_NAME_LEN]; /* path of connected device */ | 38 | char path[PPS_MAX_NAME_LEN]; /* path of connected device */ |
| 40 | int mode; /* PPS's allowed mode */ | 39 | int mode; /* PPS allowed mode */ |
| 41 | 40 | ||
| 42 | void (*echo)(struct pps_device *pps, | 41 | void (*echo)(struct pps_device *pps, |
| 43 | int event, void *data); /* PPS echo function */ | 42 | int event, void *data); /* PPS echo function */ |
| @@ -57,10 +56,10 @@ struct pps_event_time { | |||
| 57 | struct pps_device { | 56 | struct pps_device { |
| 58 | struct pps_source_info info; /* PSS source info */ | 57 | struct pps_source_info info; /* PSS source info */ |
| 59 | 58 | ||
| 60 | struct pps_kparams params; /* PPS's current params */ | 59 | struct pps_kparams params; /* PPS current params */ |
| 61 | 60 | ||
| 62 | __u32 assert_sequence; /* PPS' assert event seq # */ | 61 | __u32 assert_sequence; /* PPS assert event seq # */ |
| 63 | __u32 clear_sequence; /* PPS' clear event seq # */ | 62 | __u32 clear_sequence; /* PPS clear event seq # */ |
| 64 | struct pps_ktime assert_tu; | 63 | struct pps_ktime assert_tu; |
| 65 | struct pps_ktime clear_tu; | 64 | struct pps_ktime clear_tu; |
| 66 | int current_mode; /* PPS mode at event time */ | 65 | int current_mode; /* PPS mode at event time */ |
| @@ -69,7 +68,7 @@ struct pps_device { | |||
| 69 | wait_queue_head_t queue; /* PPS event queue */ | 68 | wait_queue_head_t queue; /* PPS event queue */ |
| 70 | 69 | ||
| 71 | unsigned int id; /* PPS source unique ID */ | 70 | unsigned int id; /* PPS source unique ID */ |
| 72 | void const *lookup_cookie; /* pps_lookup_dev only */ | 71 | void const *lookup_cookie; /* For pps_lookup_dev() only */ |
| 73 | struct cdev cdev; | 72 | struct cdev cdev; |
| 74 | struct device *dev; | 73 | struct device *dev; |
| 75 | struct fasync_struct *async_queue; /* fasync method */ | 74 | struct fasync_struct *async_queue; /* fasync method */ |
| @@ -101,7 +100,7 @@ extern struct pps_device *pps_register_source( | |||
| 101 | extern void pps_unregister_source(struct pps_device *pps); | 100 | extern void pps_unregister_source(struct pps_device *pps); |
| 102 | extern void pps_event(struct pps_device *pps, | 101 | extern void pps_event(struct pps_device *pps, |
| 103 | struct pps_event_time *ts, int event, void *data); | 102 | struct pps_event_time *ts, int event, void *data); |
| 104 | /* Look up a pps device by magic cookie */ | 103 | /* Look up a pps_device by magic cookie */ |
| 105 | struct pps_device *pps_lookup_dev(void const *cookie); | 104 | struct pps_device *pps_lookup_dev(void const *cookie); |
| 106 | 105 | ||
| 107 | static inline void timespec_to_pps_ktime(struct pps_ktime *kt, | 106 | static inline void timespec_to_pps_ktime(struct pps_ktime *kt, |
| @@ -132,4 +131,3 @@ static inline void pps_sub_ts(struct pps_event_time *ts, struct timespec64 delta | |||
| 132 | } | 131 | } |
| 133 | 132 | ||
| 134 | #endif /* LINUX_PPS_KERNEL_H */ | 133 | #endif /* LINUX_PPS_KERNEL_H */ |
| 135 | |||
