diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2012-02-22 12:11:23 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2012-02-22 12:11:23 +0000 |
commit | 2d94a303ec350feb13be9f92b0e726f4236945e6 (patch) | |
tree | 19ecae7750001e6e4f2b1cb065b8f4d30b701b4a /drivers/dahdi/dahdi-sysfs.c | |
parent | 12336c61e43d7cff62ca9547c418875f8c876fdb (diff) |
sysfs channels: refactor compat macros
* Refactor all kernel version compatibility macros that relate
to sysfs and device files to new header: dahdi-sysfs.h
* No functional change.
* Preparing for a refactor channel device file handling into a new
source file.
Signed-off-by: Oron Peled <oron.peled@xorcom.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10462 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi-sysfs.c')
-rw-r--r-- | drivers/dahdi/dahdi-sysfs.c | 91 |
1 files changed, 1 insertions, 90 deletions
diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c index b3b10d8..d14b15c 100644 --- a/drivers/dahdi/dahdi-sysfs.c +++ b/drivers/dahdi/dahdi-sysfs.c @@ -6,37 +6,7 @@ #include <linux/slab.h> #include "dahdi.h" - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -#define CLASS_DEV_CREATE(class, devt, device, name) \ - device_create(class, device, devt, NULL, "%s", name) -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) -#define CLASS_DEV_CREATE(class, devt, device, name) \ - device_create(class, device, devt, name) -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) -#define CLASS_DEV_CREATE(class, devt, device, name) \ - class_device_create(class, NULL, devt, device, name) -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) -#define CLASS_DEV_CREATE(class, devt, device, name) \ - class_device_create(class, devt, device, name) -#else -#define CLASS_DEV_CREATE(class, devt, device, name) \ - class_simple_device_add(class, devt, device, name) -#endif - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) -#define CLASS_DEV_DESTROY(class, devt) \ - device_destroy(class, devt) -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) -#define CLASS_DEV_DESTROY(class, devt) \ - class_device_destroy(class, devt) -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9) -#define CLASS_DEV_DESTROY(class, devt) \ - class_simple_device_remove(devt) -#else -#define CLASS_DEV_DESTROY(class, devt) \ - class_simple_device_remove(class, devt) -#endif +#include "dahdi-sysfs.h" #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) static struct class *dahdi_class; @@ -46,65 +16,6 @@ static struct class_simple *dahdi_class; #define class_destroy class_simple_destroy #endif -/* - * Very old hotplug support - */ -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 9) -#define OLD_HOTPLUG_SUPPORT /* for older kernels */ -#define OLD_HOTPLUG_SUPPORT_269 -#endif - -#ifdef OLD_HOTPLUG_SUPPORT_269 -/* Copy from new kernels lib/kobject_uevent.c */ -enum kobject_action { - KOBJ_ADD, - KOBJ_REMOVE, - KOBJ_CHANGE, - KOBJ_MOUNT, - KOBJ_UMOUNT, - KOBJ_OFFLINE, - KOBJ_ONLINE, -}; -#endif - -/* - * Hotplug replaced with uevent in 2.6.16 - */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16) -#define OLD_HOTPLUG_SUPPORT /* for older kernels */ -#endif - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14) -#define DEVICE_ATTR_READER(name, dev, buf) \ - ssize_t name(struct device *dev, \ - struct device_attribute *attr, \ - char *buf) -#define DEVICE_ATTR_WRITER(name, dev, buf, count) \ - ssize_t name(struct device *dev, \ - struct device_attribute *attr, \ - const char *buf, size_t count) -#define BUS_ATTR_READER(name, dev, buf) \ - ssize_t name(struct device *dev, \ - struct device_attribute *attr, \ - char *buf) -#define BUS_ATTR_WRITER(name, dev, buf, count) \ - ssize_t name(struct device *dev, \ - struct device_attribute *attr, \ - const char *buf, size_t count) -#else -#define DEVICE_ATTR_READER(name, dev, buf) \ - ssize_t name(struct device *dev, char *buf) -#define DEVICE_ATTR_WRITER(name, dev, buf, count) \ - ssize_t name(struct device *dev, const char *buf, size_t count) -#define BUS_ATTR_READER(name, dev, buf) \ - ssize_t name(struct device *dev, char *buf) -#define BUS_ATTR_WRITER(name, dev, buf, count) \ - ssize_t name(struct device *dev, const char *buf, size_t count) -#endif - -#define DRIVER_ATTR_READER(name, drv, buf) \ - ssize_t name(struct device_driver *drv, char * buf) - static char *initdir = "/usr/share/dahdi"; module_param(initdir, charp, 0644); |