715-3.3-1588-fixes.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233
  1. --- a/Embedded/src/1588/1588.c
  2. +++ b/Embedded/src/1588/1588.c
  3. @@ -664,8 +664,7 @@ irqreturn_t timesync_isr(int irq, void *
  4. 0 => success
  5. < 0 => error
  6. ******************************************************************************/
  7. -int timesync_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
  8. - unsigned long arg)
  9. +long timesync_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  10. {
  11. wait_queue_head_t *event = NULL;
  12. unsigned int bytes_ret = 0;
  13. --- a/Embedded/src/1588/1588.h
  14. +++ b/Embedded/src/1588/1588.h
  15. @@ -121,8 +121,7 @@ MODULE_DEVICE_TABLE(pci, pci_ids);
  16. // Linux functions
  17. int timesync_open(struct inode *inode, struct file *filp);
  18. int timesync_release(struct inode *inode, struct file *filp);
  19. -int timesync_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
  20. - unsigned long arg);
  21. +long timesync_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
  22. void timesync_close(void);
  23. int pci_suspend(struct pci_dev *dev, pm_message_t state);
  24. int pci_resume(struct pci_dev *dev);
  25. @@ -142,7 +141,7 @@ struct file_operations file_ops =
  26. .owner = THIS_MODULE,
  27. .open = timesync_open,
  28. .release = timesync_release,
  29. - .ioctl = timesync_ioctl,
  30. + .unlocked_ioctl = timesync_ioctl,
  31. };
  32. // Linux pci operations