summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2008-12-11 16:46:36 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2008-12-11 16:46:36 +0000
commitdf084b319c3e4bd5420e059a9ade9a22b7c9bfba (patch)
tree94759594f498f64af3f0aba1aa691c744d836ef7
parent1cfbc24ede10c1eb21e5adff7405084066d53d4a (diff)
A bit less maigc with OLD_HOTPLUG_SUPPORT
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5483 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/xpp/xbus-core.h13
-rw-r--r--drivers/dahdi/xpp/xbus-sysfs.c14
2 files changed, 1 insertions, 26 deletions
diff --git a/drivers/dahdi/xpp/xbus-core.h b/drivers/dahdi/xpp/xbus-core.h
index ee71954..95cbaa8 100644
--- a/drivers/dahdi/xpp/xbus-core.h
+++ b/drivers/dahdi/xpp/xbus-core.h
@@ -319,19 +319,6 @@ void xpp_driver_exit(void);
int xbus_sysfs_create(xbus_t *xbus);
void xbus_sysfs_remove(xbus_t *xbus);
-#ifdef OLD_HOTPLUG_SUPPORT
-/* 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
-
void astribank_uevent_send(xbus_t *xbus, enum kobject_action act);
#endif /* XBUS_CORE_H */
diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c
index 449b4ea..6be7c7d 100644
--- a/drivers/dahdi/xpp/xbus-sysfs.c
+++ b/drivers/dahdi/xpp/xbus-sysfs.c
@@ -320,19 +320,7 @@ void astribank_uevent_send(xbus_t *xbus, enum kobject_action act)
xbus->astribank.bus_id, act);
#ifdef OLD_HOTPLUG_SUPPORT
- {
- /* Copy from new kernels lib/kobject_uevent.c */
- static const char *str[] = {
- [KOBJ_ADD] "add",
- [KOBJ_REMOVE] "remove",
- [KOBJ_CHANGE] "change",
- [KOBJ_MOUNT] "mount",
- [KOBJ_UMOUNT] "umount",
- [KOBJ_OFFLINE] "offline",
- [KOBJ_ONLINE] "online"
- };
- kobject_hotplug(str[act], kobj);
- }
+ kobject_hotplug(str[act], kobj);
#else
kobject_uevent(kobj, act);
#endif