Use inode open argument to obtain minor number.

[lincan.git] / lincan / include / can_sysdep.h

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index 452afbc41d66d3ce0a2ab062b1f0606552b73190..165d4a12e1fb37dc3cbb82a61b3e7ce000ca9844 100644 (file)
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -55,6 +55,7 @@
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
+#include <linux/time.h>
 #include <asm/errno.h>
 
 #include <asm/io.h>
@@ -132,13 +133,13 @@
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,7)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
 
-#define MINOR_NR \
-       (MINOR(file->f_dentry->d_inode->i_rdev))
+#define INODE2MINOR_NR(inode) \
+       (MINOR(inode->i_rdev))
 
 #else /* Linux kernel < 2.5.7 or >= 2.6.0 */
 
-#define MINOR_NR \
-       (minor(file->f_dentry->d_inode->i_rdev))
+#define INODE2MINOR_NR(inode) \
+       (minor(inode->i_rdev))
 
 #endif /* Linux kernel < 2.5.7 or >= 2.6.0 */
 
@@ -213,6 +214,21 @@
 
 #ifdef __HAVE_ARCH_CMPXCHG
   #define CAN_HAVE_ARCH_CMPXCHG
+  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+    #define CAN_HAVE_ATOMIC_CMPXCHG
+  #endif
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
+  #define can_pci_dev_get(_M_pdev) (_M_pdev)
+  #define can_pci_dev_put(_M_pdev) do {} while(0)
+  #define can_pci_get_device pci_find_device
+  #define can_pci_get_subsys pci_find_subsys
+#else /* > 2.6.0 */
+  #define can_pci_dev_get pci_dev_get
+  #define can_pci_dev_put pci_dev_put
+  #define can_pci_get_device pci_get_device
+  #define can_pci_get_subsys pci_get_subsys
 #endif
 
 #ifndef CAN_WITH_RTL