[PATCH] remove dbus code from core udev code as it's no longer needed to be there.

diff --git a/udev-add.c b/udev-add.c
index 94a423dc6e56f36fe29d1b9f5f20352740be1a18..369ea82b6c33a25cf844cd7dca296cf17f71e04c 100644 (file)
--- a/udev-add.c
+++ b/udev-add.c
@@ -39,7 +39,6 @@
 #include "udev.h"
 #include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "udev_selinux.h"
 #include "logging.h"
 #include "namedev.h"
@@ -417,10 +416,8 @@ int udev_add_device(char *path, char *subsystem, int fake)
        dbg("name='%s'", dev.name);
        retval = create_node(&dev, fake);
 
-       if ((retval == 0) && (!fake)) {
+       if ((retval == 0) && (!fake))
                dev_d_send(&dev, subsystem);
-               sysbus_send_create(&dev, path);
-       }
 
 exit:
        if (class_dev)

diff --git a/udev-remove.c b/udev-remove.c
index dc6fcfc331e7c8d16305dd45f4fd9497f4c6aea0..41636b684e265120897e4233658feb4120b3de22 100644 (file)
--- a/udev-remove.c
+++ b/udev-remove.c
@@ -31,7 +31,6 @@
 #include "udev.h"
 #include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -151,7 +150,6 @@ int udev_remove_device(char *path, char *subsystem)
        udevdb_delete_dev(path);
 
        dev_d_send(&dev, subsystem);
-       sysbus_send_remove(dev.name, path);
 
        retval = delete_node(&dev);
        return retval;

diff --git a/udev.c b/udev.c
index 1220e637e5ce1befce760ac9231dbf2e95814bae..52b98c8d452efb8d99a94a82005d42ce797479ba 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -32,7 +32,6 @@
 #include "udev.h"
 #include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -61,7 +60,6 @@ static void sig_handler(int signum)
        switch (signum) {
                case SIGINT:
                case SIGTERM:
-                       sysbus_disconnect();
                        udevdb_exit();
                        exit(20 + signum);
                default:
@@ -123,14 +121,11 @@ static int udev_hotplug(void)
                i++;
        }
 
-       /* connect to the system message bus */
-       sysbus_connect();
-
        /* initialize udev database */
        retval = udevdb_init(UDEVDB_DEFAULT);
        if (retval != 0) {
                dbg("unable to initialize database");
-               goto exit_sysbus;
+               goto exit;
        }
 
        /* set up a default signal handler for now */
@@ -154,10 +149,6 @@ static int udev_hotplug(void)
 
        udevdb_exit();
 
-exit_sysbus:
-       /* disconnect from the system message bus */
-       sysbus_disconnect();
-
 exit:
        if (retval > 0)
                retval = 0;

diff --git a/udev_dbus.h b/udev_dbus.h
deleted file mode 100644 (file)
index afa2046..0000000
--- a/udev_dbus.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef UDEV_DBUS_H
-#define UDEV_DBUS_H
-
-
-#ifdef USE_DBUS
-
-extern void sysbus_connect(void);
-extern void sysbus_disconnect(void);
-extern void sysbus_send_create(struct udevice *dev, const char *path);
-extern void sysbus_send_remove(const char* name, const char *path);
- 
-#else
-
-static inline void sysbus_connect(void) { }
-static inline void sysbus_disconnect(void) { }
-static inline void sysbus_send_create(struct udevice *dev, const char *path) { }
-static inline void sysbus_send_remove(const char* name, const char *path) { }
-
-#endif /* USE_DBUS */
-
-
-
-#endif