Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 7a21a3cc0be92e70474cc2ab06cb074f6a7c3f09

Authored by Alexander Gordeev
Committed by Linus Torvalds
1 parent 9ab020cf07
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

pps: trivial fixes 

Here are some very trivial fixes combined:

- add macro definitions to protect header file from including several times

- remove declaration for an unexistent array

- fix typos

Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
Acked-by: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 6 additions and 2 deletions Side-by-side Diff

... ... @@ -324,7 +324,7 @@
324 324 captured = ~0;
325 325 }
326 326  
327   - /* Wake up iif captured somthing */
  327 + /* Wake up if captured something */
328 328 if (captured) {
329 329 pps->go = ~0;
330 330 wake_up_interruptible(&pps->queue);
include/linux/pps_kernel.h
Diff comments   View file @ 7a21a3c
... ... @@ -18,6 +18,9 @@
18 18 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19 19 */
20 20  
  21 +#ifndef LINUX_PPS_KERNEL_H
  22 +#define LINUX_PPS_KERNEL_H
  23 +
21 24 #include <linux/pps.h>
22 25  
23 26 #include <linux/cdev.h>
... ... @@ -71,7 +74,6 @@
71 74  
72 75 extern spinlock_t pps_idr_lock;
73 76 extern struct idr pps_idr;
74   -extern struct timespec pps_irq_ts[];
75 77  
76 78 extern struct device_attribute pps_attrs[];
77 79  
... ... @@ -87,4 +89,6 @@
87 89 extern int pps_register_cdev(struct pps_device *pps);
88 90 extern void pps_unregister_cdev(struct pps_device *pps);
89 91 extern void pps_event(int source, struct pps_ktime *ts, int event, void *data);
  92 +
  93 +#endif /* LINUX_PPS_KERNEL_H */