Sigh more compat fixes, this is almost right for 2.6.9 - 2.6.26 kernels.

git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@157 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
This commit is contained in:
behlendo
2008-08-11 23:47:44 +00:00
parent b61a6e8bdc
commit 25557fd884
6 changed files with 32 additions and 19 deletions
+13 -7
View File
@@ -9,12 +9,14 @@
#ifdef HAVE_DEVICE_CREATE
typedef struct class spl_class;
typedef struct device spl_device;
#define spl_class_create(mod, name) class_create(mod, name)
#define spl_class_destroy(cls) class_destroy(cls)
#define spl_device_create(cls, parent, devt, device, fmt, args...) \
#define spl_device_create(cls, parent, devt, device, fmt, args...) \
device_create(cls, parent, devt, fmt, ## args)
#define spl_device_destroy(cls, devt) device_destroy(cls, devt)
#define spl_device_destroy(cls, cls_dev, devt) \
device_destroy(cls, devt)
/*
* Preferred API from 2.6.13 to 2.6.17
@@ -25,12 +27,14 @@ typedef struct class spl_class;
#ifdef HAVE_CLASS_DEVICE_CREATE
typedef struct class spl_class;
typedef struct class_device spl_device;
#define spl_class_create(mod, name) class_create(mod, name)
#define spl_class_destroy(cls) class_destroy(cls)
#define spl_device_create(cls, parent, devt, device, fmt, args...) \
class_device_create(cls, parent, devt, device, fmt, ## args)
#define spl_device_destroy(cls, devt) class_device_destroy(cls, devt)
#define spl_device_create(cls, parent, devt, device, fmt, args...) \
class_device_create(cls, devt, device, fmt, ## args)
#define spl_device_destroy(cls, cls_dev, devt) \
class_device_unregister(cls_dev)
/*
* Prefered API from 2.6.0 to 2.6.12
@@ -40,12 +44,14 @@ typedef struct class spl_class;
#else /* Legacy API */
typedef struct class_simple spl_class;
typedef struct class_device spl_class_device;
#define spl_class_create(mod, name) class_simple_create(mod, name)
#define spl_class_destroy(cls) class_simple_destroy(cls)
#define spl_device_create(cls, parent, devt, device, fmt, args...) \
#define spl_device_create(cls, parent, devt, device, fmt, args...) \
class_simple_device_add(cls, devt, device, fmt, ## args)
#define spl_device_destroy(cls, devt) class_simple_device_remove(devt)
#define spl_device_destroy(cls, cls_dev, devt) \
class_simple_device_remove(devt)
#endif
#endif
+1
View File
@@ -82,6 +82,7 @@ typedef struct dev_info {
struct dev_ops *di_ops;
struct cdev *di_cdev;
spl_class *di_class;
spl_device *di_device;
major_t di_major;
minor_t di_minor;
dev_t di_dev;