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

This commit is contained in:
greg@kroah.com
2005-04-26 21:35:11 -07:00
committed by Greg KH
parent dd64e26b0c
commit 7e371e86a4
4 changed files with 2 additions and 39 deletions
+1 -4
View File
@@ -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)
-2
View File
@@ -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;
+1 -10
View File
@@ -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;
-23
View File
@@ -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