From nobody Mon Feb 9 05:52:50 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 048B414E2F0 for ; Wed, 21 Aug 2024 15:48:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255327; cv=none; b=DxRtllB1p/0DjKFEyTygc3Frf6ElVBEnxmReMzNnCb3DVunAbqrnOb+ByHfZGbVMX2nvJ0+hjHgAgi1ASrwqHJqIcdXHWj85wAkI5uO9Uy6RMCaiog2cHmEBylTjHxgTk1AfjeOlDDfXZPnkE3dgjWhnfa7c4ZqKNc9WJ1KrspI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255327; c=relaxed/simple; bh=I5Cv3aWuNr+mfC4v8KflKEYuNjZ/J/Xj9DgNNHl5MwI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=orEgxtb7LEg5jGUMadARzF9mIj3ubei2oSkAotxVh4poS7Wmzmn8HFY+IPJCZSpxmmzoXbuYI5a9pA2QwClcFbz15NZeKzX2ZT5prb+e7v0nwk3s3jq/Sko2BloCjI5O7CuUg2lIfzOIHhR5HvxP0rgll04jKI3qy67ltgD9atU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=B8oLptvQ; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="B8oLptvQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724255326; x=1755791326; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=I5Cv3aWuNr+mfC4v8KflKEYuNjZ/J/Xj9DgNNHl5MwI=; b=B8oLptvQ7Ov+YD5iIB+1Y2qwV4MN5QguaFl6JLx3f4scdj9c1ZTV/LGJ tr4hYRJIekTXQtO3yiYHbg621geakMRA8V/HkJO1Kd8v5Zl3FMhhgp3WR cCQSOCwNSqmaeVlc8CN1l8Bl6hmm6lG55qWjtcRMBf1ESy9I53RlsueST /MROd5xLwtkQtSeL3IJGZnWvH68S65huAeEe0WZMFmX2Ep03KoTDbqQzQ Guw4m5+stt/or+nahE1h5G0Y1ZuWDHxqLr2z1ihH0v4VB0IXk6qe8Lu2K 0L07ZrVB0BtMaxVibYKMQvJZnRr9ye29durqUzH8ZjqqTGLsteq55ChO7 g==; X-CSE-ConnectionGUID: XMJ9veh8Txah8oRLGQCLsA== X-CSE-MsgGUID: wBru0v5rTT67StIXjWOS7A== X-IronPort-AV: E=McAfee;i="6700,10204,11171"; a="13135000" X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="13135000" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2024 08:48:44 -0700 X-CSE-ConnectionGUID: VW0IWYxQQFaKNtpX+YW7zg== X-CSE-MsgGUID: GRqCQDUrQau+4nyS+e7DLQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="61107976" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa009.jf.intel.com with ESMTP; 21 Aug 2024 08:48:42 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 08B9C152; Wed, 21 Aug 2024 18:48:40 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Zijun Hu , Andy Shevchenko Subject: [PATCH v1 1/5] driver core: Sort headers Date: Wed, 21 Aug 2024 18:48:19 +0300 Message-ID: <20240821154839.604259-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> References: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Sort the headers in alphabetic order in order to ease the maintenance for this part. Signed-off-by: Andy Shevchenko --- drivers/base/core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 144cb8c201fb..6b9d3d255135 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -9,29 +9,29 @@ */ =20 #include +#include #include #include +#include /* for dma_default_coherent */ #include #include #include +#include #include #include -#include -#include +#include +#include #include #include #include -#include -#include #include -#include #include -#include #include +#include +#include #include #include #include -#include /* for dma_default_coherent */ =20 #include "base.h" #include "physical_location.h" --=20 2.43.0.rc1.1336.g36b5255a03ac From nobody Mon Feb 9 05:52:50 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 470BF15351A for ; Wed, 21 Aug 2024 15:48:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255327; cv=none; b=cGq0hq1IQ5onUwQPXH435R4BoENq/ppPHmu0lcmxSwv9uIZL8XPARKkiRI+Rybx+JztHPazHSOo6z/CYz8TIlvLGQlkSWdQodH1iGInRGPDVArVFyy+ui0I+uVlzM8EnkR9d5UOOra3wj/Tz/CTJeSEp7EoSbfdrqXPXyX1sBbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255327; c=relaxed/simple; bh=R6OqrPboQJiBPG6d8rzIvuM4XVVf3Y1qoXELO+1nxFw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F/5BVfkHEx3V/JNAXU6Lt9dJrNVsolreeT4HH12c+a5Mm6gsOJZoWxaN9O0VOLl7ovjgLT1+M39yBbEqsu99eoevN662/XzXNlOockyVNvpdMtAUchrsbIskJnolz+pGckqkJ4n2j7PkycLs/0spWWHIt74sT041M5oWH8oyCA4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=GDxDUqcD; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="GDxDUqcD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724255325; x=1755791325; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=R6OqrPboQJiBPG6d8rzIvuM4XVVf3Y1qoXELO+1nxFw=; b=GDxDUqcD6LSJKL72L3kXiKdE6lnpbIOe1/W1os/18lnFs6ZfoUmFU922 PoS3pa6z2GooqeR3muBjvsJ85uGRfz7yO9UK5gWREkdwjngJZH7Wsrmi9 aoOry7w04TQ0jwjYxoJXm3NqAsc2/6yd51CX17ft6pVH+UgonQs4oRvgE iRT+XiIQMIeCTXEDTc1ol6JnWFFxc2wkT8z8qKtrPdc8V8IyXS3yWbV1o RLkC65cElPa9+1hGaWC3GgCZCU4Hbty9NHPcOYGS0u/9cRnTxfzwHs4TP 9A+G/F5v4UpLwyKIP0n4Ki8ezZzMR44f/QroT1X8KBoc/+/ZuXoyJE4M6 g==; X-CSE-ConnectionGUID: KPeKWpT5QiKpQwWd8L5JUQ== X-CSE-MsgGUID: eCEVmebNSlqcQmHi4DcKdg== X-IronPort-AV: E=McAfee;i="6700,10204,11171"; a="26376278" X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="26376278" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2024 08:48:44 -0700 X-CSE-ConnectionGUID: 7Z99zUlTS/OGfy+38nhX9A== X-CSE-MsgGUID: oMjiuJ+wQc+y7l+eIlalZg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="66080304" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa004.jf.intel.com with ESMTP; 21 Aug 2024 08:48:42 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 17D9F49F; Wed, 21 Aug 2024 18:48:41 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Zijun Hu , Andy Shevchenko Subject: [PATCH v1 2/5] driver core: Use kasprintf() instead of fixed buffer formatting Date: Wed, 21 Aug 2024 18:48:20 +0300 Message-ID: <20240821154839.604259-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> References: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Improve readability and maintainability by replacing a hardcoded string allocation and formatting by the use of the kasprintf() helper. Signed-off-by: Andy Shevchenko --- drivers/base/core.c | 70 +++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 6b9d3d255135..f5b5b6bcdf35 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -10,6 +10,7 @@ =20 #include #include +#include #include #include #include /* for dma_default_coherent */ @@ -563,24 +564,11 @@ static struct class devlink_class =3D { =20 static int devlink_add_symlinks(struct device *dev) { + char *buf_con __free(kfree) =3D NULL, *buf_sup __free(kfree) =3D NULL; int ret; - size_t len; struct device_link *link =3D to_devlink(dev); struct device *sup =3D link->supplier; struct device *con =3D link->consumer; - char *buf; - - len =3D max(strlen(dev_bus_name(sup)) + strlen(dev_name(sup)), - strlen(dev_bus_name(con)) + strlen(dev_name(con))); - len +=3D strlen(":"); - /* - * we kzalloc() memory for symlink name of both supplier and - * consumer, so explicitly take into account both prefix. - */ - len +=3D max(strlen("supplier:"), strlen("consumer:")) + 1; - buf =3D kzalloc(len, GFP_KERNEL); - if (!buf) - return -ENOMEM; =20 ret =3D sysfs_create_link(&link->link_dev.kobj, &sup->kobj, "supplier"); if (ret) @@ -590,58 +578,64 @@ static int devlink_add_symlinks(struct device *dev) if (ret) goto err_con; =20 - snprintf(buf, len, "consumer:%s:%s", dev_bus_name(con), dev_name(con)); - ret =3D sysfs_create_link(&sup->kobj, &link->link_dev.kobj, buf); + buf_con =3D kasprintf(GFP_KERNEL, "consumer:%s:%s", dev_bus_name(con), de= v_name(con)); + if (!buf_con) { + ret =3D -ENOMEM; + goto err_con_dev; + } + + ret =3D sysfs_create_link(&sup->kobj, &link->link_dev.kobj, buf_con); if (ret) goto err_con_dev; =20 - snprintf(buf, len, "supplier:%s:%s", dev_bus_name(sup), dev_name(sup)); - ret =3D sysfs_create_link(&con->kobj, &link->link_dev.kobj, buf); + buf_sup =3D kasprintf(GFP_KERNEL, "supplier:%s:%s", dev_bus_name(sup), de= v_name(sup)); + if (!buf_sup) { + ret =3D -ENOMEM; + goto err_sup_dev; + } + + ret =3D sysfs_create_link(&con->kobj, &link->link_dev.kobj, buf_sup); if (ret) goto err_sup_dev; =20 goto out; =20 err_sup_dev: - snprintf(buf, len, "consumer:%s:%s", dev_bus_name(con), dev_name(con)); - sysfs_remove_link(&sup->kobj, buf); + sysfs_remove_link(&sup->kobj, buf_con); err_con_dev: sysfs_remove_link(&link->link_dev.kobj, "consumer"); err_con: sysfs_remove_link(&link->link_dev.kobj, "supplier"); out: - kfree(buf); return ret; } =20 static void devlink_remove_symlinks(struct device *dev) { + char *buf_con __free(kfree) =3D NULL, *buf_sup __free(kfree) =3D NULL; struct device_link *link =3D to_devlink(dev); - size_t len; struct device *sup =3D link->supplier; struct device *con =3D link->consumer; - char *buf; =20 sysfs_remove_link(&link->link_dev.kobj, "consumer"); sysfs_remove_link(&link->link_dev.kobj, "supplier"); =20 - len =3D max(strlen(dev_bus_name(sup)) + strlen(dev_name(sup)), - strlen(dev_bus_name(con)) + strlen(dev_name(con))); - len +=3D strlen(":"); - len +=3D max(strlen("supplier:"), strlen("consumer:")) + 1; - buf =3D kzalloc(len, GFP_KERNEL); - if (!buf) { - WARN(1, "Unable to properly free device link symlinks!\n"); - return; + if (device_is_registered(con)) { + buf_sup =3D kasprintf(GFP_KERNEL, "supplier:%s:%s", dev_bus_name(sup), d= ev_name(sup)); + if (!buf_sup) + goto out; + sysfs_remove_link(&con->kobj, buf_sup); } =20 - if (device_is_registered(con)) { - snprintf(buf, len, "supplier:%s:%s", dev_bus_name(sup), dev_name(sup)); - sysfs_remove_link(&con->kobj, buf); - } - snprintf(buf, len, "consumer:%s:%s", dev_bus_name(con), dev_name(con)); - sysfs_remove_link(&sup->kobj, buf); - kfree(buf); + buf_con =3D kasprintf(GFP_KERNEL, "consumer:%s:%s", dev_bus_name(con), de= v_name(con)); + if (!buf_con) + goto out; + sysfs_remove_link(&sup->kobj, buf_con); + + return; + +out: + WARN(1, "Unable to properly free device link symlinks!\n"); } =20 static struct class_interface devlink_class_intf =3D { --=20 2.43.0.rc1.1336.g36b5255a03ac From nobody Mon Feb 9 05:52:50 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1ECDC1BAEEF for ; Wed, 21 Aug 2024 15:48:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255328; cv=none; b=BO3BL8XMMuI0feKpRQayvNdQxugg4tZhwKme2mNgq3+jZ6Op0lZ9R7Ewk8mA4C3CbRD31WNViTIRbFe4NKcAEPP8HVI+RRF7gS7TZAx0RNjsxVPEA3gQyg5uJXEoakP8KxuyrUToisUZ8tMijPPhSf9qJnZm0W9Fh1ICqi+u/UI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255328; c=relaxed/simple; bh=IvbQVTKxBadavaVqnza3itzSwqETzToWSwNnsjXbj94=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=buGsaLCS73Psm7xddP9518S6atJTnw6kjMo/fS7UC3p6AuVYGYlSiAkAJqdLZhHf6vrlPkSXlj5SyUPCUdr0L72er+oppuycRFeMOjOuPTNSNRzzQpi5aT220cOVZiRmyj8ae0huYHeKDVfbxv04eqVrvNbQGdSTj2Fo3kTQD1s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=X/aPQ4DD; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="X/aPQ4DD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724255328; x=1755791328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IvbQVTKxBadavaVqnza3itzSwqETzToWSwNnsjXbj94=; b=X/aPQ4DD+4lOBCDcF3Q1P94qJcxiTsgsg0u6u4GO73J6qHiABJmUJSTE lkcaGcB8CgaKzsWLbW7OoW1LeZ+S5bguIA7Bi9CPSF5EmpnzSsc3XE8e6 qQsTjI0HdUDwyPuXQs2r1oApvsNx/tn3d84sDj0iWLaAlZqUn5Ack0Q6n 0FOWwjomjRdpprkf1u7k1FiXK0jpFsj6RiT5qC5qN+EYwLaljuWEfcDNx 449+6RZaBzoGZRL1GMkE0sMYAssbI21+XWIq6JfnX/cbULJS2oKaJeLSs c1etYPNAHMhlcQpUBlWUsWx/GP0gzmrUFoca3vZb2enpiT64BGC6TTPrI g==; X-CSE-ConnectionGUID: FDsoPYZuQs2FOTnygMZwbw== X-CSE-MsgGUID: Uf6fHKN3R3altth0eAQGMA== X-IronPort-AV: E=McAfee;i="6700,10204,11171"; a="26376282" X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="26376282" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2024 08:48:44 -0700 X-CSE-ConnectionGUID: b5JaFwwWTfyBQMuVaNPSxg== X-CSE-MsgGUID: 2kNnkXgEQOCAKyrJLScQww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="66080305" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa004.jf.intel.com with ESMTP; 21 Aug 2024 08:48:42 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 26AE6644; Wed, 21 Aug 2024 18:48:41 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Zijun Hu , Andy Shevchenko Subject: [PATCH v1 3/5] driver core: Use guards for simple mutex locks Date: Wed, 21 Aug 2024 18:48:21 +0300 Message-ID: <20240821154839.604259-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> References: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Guards can help to make the code more readable. So use it wherever they do so. Signed-off-by: Andy Shevchenko --- drivers/base/core.c | 50 ++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index f5b5b6bcdf35..bff5e53ca0ce 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -98,12 +98,9 @@ static int __fwnode_link_add(struct fwnode_handle *con, int fwnode_link_add(struct fwnode_handle *con, struct fwnode_handle *sup, u8 flags) { - int ret; + guard(mutex)(&fwnode_link_lock); =20 - mutex_lock(&fwnode_link_lock); - ret =3D __fwnode_link_add(con, sup, flags); - mutex_unlock(&fwnode_link_lock); - return ret; + return __fwnode_link_add(con, sup, flags); } =20 /** @@ -144,10 +141,10 @@ static void fwnode_links_purge_suppliers(struct fwnod= e_handle *fwnode) { struct fwnode_link *link, *tmp; =20 - mutex_lock(&fwnode_link_lock); + guard(mutex)(&fwnode_link_lock); + list_for_each_entry_safe(link, tmp, &fwnode->suppliers, c_hook) __fwnode_link_del(link); - mutex_unlock(&fwnode_link_lock); } =20 /** @@ -160,10 +157,10 @@ static void fwnode_links_purge_consumers(struct fwnod= e_handle *fwnode) { struct fwnode_link *link, *tmp; =20 - mutex_lock(&fwnode_link_lock); + guard(mutex)(&fwnode_link_lock); + list_for_each_entry_safe(link, tmp, &fwnode->consumers, s_hook) __fwnode_link_del(link); - mutex_unlock(&fwnode_link_lock); } =20 /** @@ -1059,20 +1056,16 @@ int device_links_check_suppliers(struct device *dev) * Device waiting for supplier to become available is not allowed to * probe. */ - mutex_lock(&fwnode_link_lock); - sup_fw =3D fwnode_links_check_suppliers(dev->fwnode); - if (sup_fw) { - if (!dev_is_best_effort(dev)) { - fwnode_ret =3D -EPROBE_DEFER; - dev_err_probe(dev, -EPROBE_DEFER, - "wait for supplier %pfwf\n", sup_fw); - } else { - fwnode_ret =3D -EAGAIN; + scoped_guard(mutex, &fwnode_link_lock) { + sup_fw =3D fwnode_links_check_suppliers(dev->fwnode); + if (sup_fw) { + if (dev_is_best_effort(dev)) + fwnode_ret =3D -EAGAIN; + else + return dev_err_probe(dev, -EPROBE_DEFER, + "wait for supplier %pfwf\n", sup_fw); } } - mutex_unlock(&fwnode_link_lock); - if (fwnode_ret =3D=3D -EPROBE_DEFER) - return fwnode_ret; =20 device_links_write_lock(); =20 @@ -1247,9 +1240,8 @@ static ssize_t waiting_for_supplier_show(struct devic= e *dev, bool val; =20 device_lock(dev); - mutex_lock(&fwnode_link_lock); - val =3D !!fwnode_links_check_suppliers(dev->fwnode); - mutex_unlock(&fwnode_link_lock); + scoped_guard(mutex, &fwnode_link_lock) + val =3D !!fwnode_links_check_suppliers(dev->fwnode); device_unlock(dev); return sysfs_emit(buf, "%u\n", val); } @@ -1322,13 +1314,15 @@ void device_links_driver_bound(struct device *dev) */ if (dev->fwnode && dev->fwnode->dev =3D=3D dev) { struct fwnode_handle *child; + fwnode_links_purge_suppliers(dev->fwnode); - mutex_lock(&fwnode_link_lock); + + guard(mutex)(&fwnode_link_lock); + fwnode_for_each_available_child_node(dev->fwnode, child) __fw_devlink_pickup_dangling_consumers(child, dev->fwnode); __fw_devlink_link_to_consumers(dev); - mutex_unlock(&fwnode_link_lock); } device_remove_file(dev, &dev_attr_waiting_for_supplier); =20 @@ -2337,10 +2331,10 @@ static void fw_devlink_link_device(struct device *d= ev) =20 fw_devlink_parse_fwtree(fwnode); =20 - mutex_lock(&fwnode_link_lock); + guard(mutex)(&fwnode_link_lock); + __fw_devlink_link_to_consumers(dev); __fw_devlink_link_to_suppliers(dev, fwnode); - mutex_unlock(&fwnode_link_lock); } =20 /* Device links support end. */ --=20 2.43.0.rc1.1336.g36b5255a03ac From nobody Mon Feb 9 05:52:50 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 144DE1BAEEE for ; Wed, 21 Aug 2024 15:48:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255328; cv=none; b=MvLIu4GnYxPDGCOzL3gMTPokZGX/xUX3Vp+xhhe82wbbqLmGMQ6L3l0cCJLm8QhgJ6UaePBSHqO3OLAvs1CUQfH6qcQ5ls9nugYZphWvCUmBIH57gancqjJEYh3Zs8IBGuCZnuMxZDEuo/hIFdVSn9Z7b3XfDuYAAzGryeDS4J4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255328; c=relaxed/simple; bh=wTr9OwyVYoEGd6pIaHciUj5C6cu6tfettl9Td7ydvdA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=clq0fp0EcgHqYd3j1AoibyLGjhHMO99O8EoS2xK6woXI0t2HfcO2wekNgflSSyskst+nzhOdj92N8+ryTiTkRbMo5fI3NbLwzlZuNZZhG+jbpww7e19ZNPt+1QTkkJQeGJgBcKMRQXyu0Yo+le6PcEUilpsu9/XibwIer/y2fO8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=aE+2ta93; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="aE+2ta93" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724255327; x=1755791327; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wTr9OwyVYoEGd6pIaHciUj5C6cu6tfettl9Td7ydvdA=; b=aE+2ta93ZZEcNULYRlEDCcXEKLVxkDLunCLCIYHUxAAjuEKHiEXMteC/ TOjabDPmS15ltENc66etoo0kJYf/mHzqnc0h6md4DekBHH2pHYFeFhmzC chs9e6WfDjfvHiRRBudiYNYwbv5fMLWzgG6w4Dx8urHF6Puu6kLyhZEAi xtETMFGykFb0uY7XXQIoD3WLN6lFS/SqMygP6pnnCC+ZLCdOsuD8GtjIB Z5ebdG4CghzPjmzuP0RQBj0bnGLSL8IC7xh2+8u7mPCHVD7saAhyHnyiO ZDrBASa/he7bhruwV0Wu68+WVKHZeyJLVk+zdaJVQq0vDkkD/6p0pezNQ Q==; X-CSE-ConnectionGUID: Mkn5kSC/RE2Caala2l40mw== X-CSE-MsgGUID: 24kbc43gRc65y6MWkAKAmA== X-IronPort-AV: E=McAfee;i="6700,10204,11171"; a="26376287" X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="26376287" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2024 08:48:44 -0700 X-CSE-ConnectionGUID: w1Fo7pkPS2+Cpn1erdWtpg== X-CSE-MsgGUID: yhQkbyajQzeF85TjNg8Zmg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="66080306" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa004.jf.intel.com with ESMTP; 21 Aug 2024 08:48:42 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 30BCC719; Wed, 21 Aug 2024 18:48:41 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Zijun Hu , Andy Shevchenko Subject: [PATCH v1 4/5] driver core: Make use of returned value of dev_err_probe() Date: Wed, 21 Aug 2024 18:48:22 +0300 Message-ID: <20240821154839.604259-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> References: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Instead of assigning ret explicitly to the same value that is supplied to dev_err_probe(), make use of returned value of the latter. Signed-off-by: Andy Shevchenko --- drivers/base/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index bff5e53ca0ce..1e5d7f9bc4f4 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1084,10 +1084,8 @@ int device_links_check_suppliers(struct device *dev) } =20 device_links_missing_supplier(dev); - dev_err_probe(dev, -EPROBE_DEFER, - "supplier %s not ready\n", - dev_name(link->supplier)); - ret =3D -EPROBE_DEFER; + ret =3D dev_err_probe(dev, -EPROBE_DEFER, + "supplier %s not ready\n", dev_name(link->supplier)); break; } WRITE_ONCE(link->status, DL_STATE_CONSUMER_PROBE); --=20 2.43.0.rc1.1336.g36b5255a03ac From nobody Mon Feb 9 05:52:50 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8867B1B2ECB for ; Wed, 21 Aug 2024 15:48:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255329; cv=none; b=bzt/mpHPKKayvonWXEwRdaV01+ZNKYIBNPrfnPjblPTPwqY6TyzeFdpTvlJ1eFMzbag5XuyWYLDNKeh7lKHx+F6hn7kfsvZrITsNMiFjHu1XsTwCeexGXwawXr37E9cnTv22sog/XyOzbcuLXAt2yPCpxpMTbEY/OMzavq0KFBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724255329; c=relaxed/simple; bh=nwX4DXZJkTTdl8FlMgTMpzQVu7Jzqhb9Qf7KQTNZCKE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Eq3bz0GFwn8l3YWa9LWFhWNKM+He5X48O9mdhc1ef5nIyxNBYzJq4vPRA0rkvmHK20HTMX/ohfPzFJ21pMIk+XoFiexAwpBRDtNk+m4yS+kOhEK+SGbHlphW44ao5pQ/cVzk7vcKQ+a8S1V/DX8jzUsbcP6lApw9EdxP31qyUP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=KttKlOsj; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="KttKlOsj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1724255329; x=1755791329; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nwX4DXZJkTTdl8FlMgTMpzQVu7Jzqhb9Qf7KQTNZCKE=; b=KttKlOsjZXOfXBiT1s+8CKKUHTUdNH50vQA3amkLrcQaMI4skDfyqq2V hhNlffJEPGRxyWpd45dl+YF/bZJBO9sFi0wjF8npfW6n/bfr1Us5D24L4 FEPY6aJ39IIGUlvnZiV7wCuTEyjp7lhZOzR1gCNinbbdb8PBVlO4vOl55 YTte8BCir+V4NrhCQSyV2ndxLrIakarYVo599vQmnwV7ZXE2w0eEi9WwN qeh4rWz9Ip/VRj8ZnpPDFqHnqkpwSRbUsjnsJaqLaRsvzqysS8y+jcTvC iFuJUgkTi5rsXMoLv2wqWZNIY1vHm6JKZM1LN6FEldC8vgh/smWZ84MEM w==; X-CSE-ConnectionGUID: RO0Tk5zgRaaaNKajLTQ3og== X-CSE-MsgGUID: 8NnoD3BuT66oJkxLRMDr1A== X-IronPort-AV: E=McAfee;i="6700,10204,11171"; a="26376299" X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="26376299" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Aug 2024 08:48:47 -0700 X-CSE-ConnectionGUID: DoWIQNj8TVOBYBQbmIMBFA== X-CSE-MsgGUID: dhHqAWvZRnWnLQiBjkmZKQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="66080328" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa004.jf.intel.com with ESMTP; 21 Aug 2024 08:48:44 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 3B71F72C; Wed, 21 Aug 2024 18:48:41 +0300 (EEST) From: Andy Shevchenko To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Zijun Hu , Andy Shevchenko , Andy Shevchenko Subject: [PATCH v1 5/5] driver core: Use 2-argument strscpy() Date: Wed, 21 Aug 2024 18:48:23 +0300 Message-ID: <20240821154839.604259-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1336.g36b5255a03ac In-Reply-To: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> References: <20240821154839.604259-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Andy Shevchenko Use 2-argument strscpy(), which is not only shorter but also provides an additional check that destination buffer is an array. Signed-off-by: Andy Shevchenko --- drivers/base/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 1e5d7f9bc4f4..2a31dc0ed21b 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4867,7 +4867,7 @@ set_dev_info(const struct device *dev, struct dev_pri= ntk_info *dev_info) else return; =20 - strscpy(dev_info->subsystem, subsys, sizeof(dev_info->subsystem)); + strscpy(dev_info->subsystem, subsys); =20 /* * Add device identifier DEVICE=3D: --=20 2.43.0.rc1.1336.g36b5255a03ac