libudev: device - add get_parent_with_subsystem()

[elogind.git] / extras / usb_id / usb_id.c

diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index f482147b68cd270fad090a8b82eebb57d7418e7f..f39496b07c7a47bf962e22da42173c585a2e4bcb 100644 (file)
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -208,7 +208,7 @@ static int usb_id(struct udev *udev, const char *devpath)
        int if_class_num;
        int protocol = 0;
 
-       dbg("devpath %s\n", devpath);
+       dbg(udev, "devpath %s\n", devpath);
 
        /* get all usb specific information: dev_interface, if_class, dev_usb */
        dev = sysfs_device_get(udev, devpath);
@@ -327,7 +327,7 @@ fallback:
                        usb_model = sysfs_attr_get_value(udev, dev_usb->devpath, "idProduct");
 
                if (!usb_model) {
-                       dbg("No USB model information available\n");
+                       dbg(udev, "No USB model information available\n");
                        return 1;
                }
                set_str(model_str, usb_model, sizeof(model_str)-1);
@@ -359,10 +359,10 @@ int main(int argc, char **argv)
        char devpath[MAX_PATH_LEN];
        static int export;
        static const struct option options[] = {
-               { "usb-info", 0, NULL, 'u' },
-               { "num-info", 0, NULL, 'n' },
-               { "export", 0, NULL, 'x' },
-               { "help", 0, NULL, 'h' },
+               { "usb-info", no_argument, NULL, 'u' },
+               { "num-info", no_argument, NULL, 'n' },
+               { "export", no_argument, NULL, 'x' },
+               { "help", no_argument, NULL, 'h' },
                {}
        };