X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fudev.c;h=fa5d4b417a0f7f2164b6f4245bcf20e09f52ab2e;hp=45a8b56b05dd3847b9face8e6dec0f401e3081f6;hb=638f16c7683db165154bbe53772c4b864f9dc90d;hpb=58db060fbb1548a0acdfc475fa41fe86fb32dd11

diff --git a/discover/udev.c b/discover/udev.c
index 45a8b56..fa5d4b4 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -81,11 +81,11 @@ static void udev_setup_device_params(struct udev_device *udev,
 static void lvm_vg_search(struct device_handler *handler)
 {
 	if (process_run_simple(handler, pb_system_apps.vgscan, "-qq", NULL))
-		pb_log("%s: Failed to execute vgscan\n", __func__);
+		pb_log_fn("Failed to execute vgscan\n");
 
 	if (process_run_simple(handler, pb_system_apps.vgchange, "-ay", "-qq",
 				NULL))
-		pb_log("%s: Failed to execute vgchange\n", __func__);
+		pb_log_fn("Failed to execute vgchange\n");
 }
 
 static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
@@ -241,7 +241,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
 static int udev_check_interface_ready(struct device_handler *handler,
 		struct udev_device *dev)
 {
-	const char *name, *name_path, *ifindex, *interface, *mac_name;
+	const char *name, *ifindex, *interface, *mac_name;
 	uint8_t *mac;
 	char byte[3];
 	unsigned int i, j;
@@ -253,13 +253,12 @@ static int udev_check_interface_ready(struct device_handler *handler,
 		return -1;
 	}
 
-	name_path = udev_device_get_property_value(dev, "ID_NET_NAME_PATH");
 	ifindex = udev_device_get_property_value(dev, "IFINDEX");
 	interface = udev_device_get_property_value(dev, "INTERFACE");
 	mac_name = udev_device_get_property_value(dev, "ID_NET_NAME_MAC");
 
 	/* Physical interfaces should have all of these properties */
-	if (!name_path || !ifindex || !interface || !mac_name) {
+	if (!ifindex || !interface || !mac_name) {
 		pb_debug("%s: interface %s missing properties\n",
 				__func__, name);
 		return -1;