From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Jun 2023 14:31:06 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q69MZ-00Blkk-OK for lore@lore.pengutronix.de; Mon, 05 Jun 2023 14:31:06 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1q69MW-0004Ur-FJ; Mon, 05 Jun 2023 14:31:04 +0200 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1q69MT-0004Ti-G5; Mon, 05 Jun 2023 14:31:01 +0200 Message-ID: <986bcee8-9e61-7e27-26a1-43c0bc5b23e9@pengutronix.de> Date: Mon, 5 Jun 2023 14:31:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Content-Language: en-US From: Ahmad Fatoum To: Roland Hieber References: <20220511082125.4187531-3-m.olbrich@pengutronix.de> <20230531151333.1407290-1-a.fatoum@pengutronix.de> <20230605091542.zuis5fyxssefyv4v@pengutronix.de> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [OSS-Tools] [PATCH fixup 1/2] libdt: remove ultimately unused variables X-BeenThere: oss-tools@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: Pengutronix Public Open-Source-Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: oss-tools@pengutronix.de Sender: "OSS-Tools" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: oss-tools-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On 05.06.23 11:30, Ahmad Fatoum wrote: >> I'm not completely sure which version of the code you are referencing >> here because I cannot find that context, but … > > I replied on mol's series with two fixups that should be squashed. One of them > removes *outdir, which is written, but never read. Sorry, I was confused. Please find attached a patch that actually applies on v4. The other fixup was out-of-place. ------------------ 8< --------------------- diff --git a/src/libdt.c b/src/libdt.c index de8209ce53ae..019a7555a6f6 100644 --- a/src/libdt.c +++ b/src/libdt.c @@ -2363,7 +2363,6 @@ static struct udev_device *of_find_device_by_uuid(const char *uuid) struct udev *udev; struct udev_enumerate *enumerate; struct udev_list_entry *devices, *dev_list_entry; - int ret = 0; udev = udev_new(); if (!udev) { @@ -2376,7 +2375,7 @@ static struct udev_device *of_find_device_by_uuid(const char *uuid) udev_enumerate_scan_devices(enumerate); devices = udev_enumerate_get_list_entry(enumerate); udev_list_entry_foreach(dev_list_entry, devices) { - const char *path, *devtype, *outpath, *dev_uuid; + const char *path, *devtype, *dev_uuid; struct udev_device *device; path = udev_list_entry_get_name(dev_list_entry); @@ -2388,16 +2387,12 @@ static struct udev_device *of_find_device_by_uuid(const char *uuid) continue; if (!strcmp(devtype, "disk")) { dev_uuid = udev_device_get_property_value(device, "ID_PART_TABLE_UUID"); - if (dev_uuid && !strcasecmp(dev_uuid, uuid)) { - outpath = udev_device_get_devnode(device); + if (dev_uuid && !strcasecmp(dev_uuid, uuid)) return device; - } } else if (!strcmp(devtype, "partition")) { dev_uuid = udev_device_get_property_value(device, "ID_PART_ENTRY_UUID"); - if (dev_uuid && !strcasecmp(dev_uuid, uuid)) { - outpath = udev_device_get_devnode(device); + if (dev_uuid && !strcasecmp(dev_uuid, uuid)) return device; - } } } -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |