discover: Change parsers to explicitly request configuration files

[petitboot] / discover / udev.c

diff --git a/discover/udev.c b/discover/udev.c
index 6212e4309137f47feb97cd0b09043193fdc13191..48ab745b4f371ac410048dc3ab7b93f9dc3ff4fb 100644 (file)
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -23,15 +23,6 @@
 #include "pb-discover.h"
 #include "device-handler.h"
 
-#if defined(DEBUG)
-#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args)
-#define DBGS(fmt, args...) \
-       pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
-#else
-#define DBG(fmt, args...)
-#define DBGS(fmt, args...)
-#endif
-
 struct pb_udev {
        struct udev *udev;
        struct udev_monitor *monitor;
@@ -125,7 +116,7 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev)
 
        udev_setup_device_params(dev, ddev);
 
-       device_handler_discover(udev->handler, ddev, CONF_METHOD_LOCAL_FILE);
+       device_handler_discover(udev->handler, ddev);
 
        return 0;
 }
@@ -323,7 +314,7 @@ struct pb_udev *udev_init(struct waitset *waitset,
        waiter_register_io(waitset, udev_monitor_get_fd(udev->monitor), WAIT_IN,
                udev_process, udev->monitor);
 
-       pb_log("%s: waiting on udev\n", __func__);
+       pb_debug("%s: waiting on udev\n", __func__);
 
        return udev;