From patchwork Fri Dec 8 15:14:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuno Sa via B4 Relay X-Patchwork-Id: 13485548 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 EFE3223769; Fri, 8 Dec 2023 15:14:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="F1jfEzrF" Received: by smtp.kernel.org (Postfix) with ESMTPS id 89DB6C433CC; Fri, 8 Dec 2023 15:14:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702048450; bh=OPRTb/XW+2zsH8AnZHeRHdEClBBBI7WQURvAeLFHUZo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=F1jfEzrFSkc7ceo2U++T8vWBxNqcp7SDMPQEPrUJwJRYNM4w4tKUXQ91+uuAG+nad WKmoJ/91oF+CiucYuZ5KEt7pST7vj0nRs19U/FrXJBaLdVIWrABd7OCwOgGeASTKio 65Xqv9IbPM2K8xv9Rr0HBxjMMyvc9xPPHs0jVMNmy+9t1fgV1OeD/jaqzlWcIvA6Zn 1pOzAlGbLytqXQ3YhaOSsQhijF33UAI9F69bss5XVE3lyyRGw5hSpXdQXAhLnE7QZj uPIZQGeUsxhmNyN/u7rL5Jm+3dAy/tVDHF6jtY28mc7Jvt3efyOLlKKNNn4Fs7ZC+E rMUR3gURGQ/XA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71839C10DC1; Fri, 8 Dec 2023 15:14:10 +0000 (UTC) From: Nuno Sa via B4 Relay Date: Fri, 08 Dec 2023 16:14:10 +0100 Subject: [PATCH v2 3/8] driver: core: allow modifying device_links flags Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20231208-dev-iio-backend-v2-3-5450951895e1@analog.com> References: <20231208-dev-iio-backend-v2-0-5450951895e1@analog.com> In-Reply-To: <20231208-dev-iio-backend-v2-0-5450951895e1@analog.com> To: devicetree@vger.kernel.org, linux-iio@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , Rob Herring , Frank Rowand , Jonathan Cameron , Lars-Peter Clausen , Michael Hennerich , Krzysztof Kozlowski , Conor Dooley X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1702048448; l=1762; i=nuno.sa@analog.com; s=20231116; h=from:subject:message-id; bh=NLZHAx7QEa2fUUjKTtfo6RESv2OQO0JG++qc/yxWC4M=; b=ASOBUH495cPlwGqGxHPodgKqYv81aF+nGrtg6/d7TDTSOn8lqsHouzKLnCX2reyPDdZDNQmx3 ULN8adbHoSnBbiPSXjX8hhFAs8zfLET+ys5pqnP/tXGBAS/0dI+u50s X-Developer-Key: i=nuno.sa@analog.com; a=ed25519; pk=3NQwYA013OUYZsmDFBf8rmyyr5iQlxV/9H4/Df83o1E= X-Endpoint-Received: by B4 Relay for nuno.sa@analog.com/20231116 with auth_id=100 X-Original-From: Nuno Sa Reply-To: From: Nuno Sa If a device_link is previously created (eg: via fw_devlink_create_devlink()) before the supplier + consumer are both present and bound to their respective drivers, there's no way to set DL_FLAG_AUTOREMOVE_CONSUMER anymore while one can still set DL_FLAG_AUTOREMOVE_SUPPLIER. Hence, rework the flags checks to allow for DL_FLAG_AUTOREMOVE_CONSUMER in the same way DL_FLAG_AUTOREMOVE_SUPPLIER is done. While at it, make sure that we are never left with DL_FLAG_AUTOPROBE_CONSUMER set together with one of DL_FLAG_AUTOREMOVE_CONSUMER or DL_FLAG_AUTOREMOVE_SUPPLIER. Signed-off-by: Nuno Sa --- drivers/base/core.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 67ba592afc77..fdbb5abc75d5 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -807,11 +807,15 @@ struct device_link *device_link_add(struct device *consumer, * update the existing link to stay around longer. */ if (flags & DL_FLAG_AUTOREMOVE_SUPPLIER) { - if (link->flags & DL_FLAG_AUTOREMOVE_CONSUMER) { - link->flags &= ~DL_FLAG_AUTOREMOVE_CONSUMER; - link->flags |= DL_FLAG_AUTOREMOVE_SUPPLIER; - } - } else if (!(flags & DL_FLAG_AUTOREMOVE_CONSUMER)) { + link->flags &= ~DL_FLAG_AUTOREMOVE_CONSUMER; + link->flags &= ~DL_FLAG_AUTOPROBE_CONSUMER; + link->flags |= DL_FLAG_AUTOREMOVE_SUPPLIER; + + } else if (flags & DL_FLAG_AUTOREMOVE_CONSUMER) { + link->flags &= ~DL_FLAG_AUTOREMOVE_SUPPLIER; + link->flags &= ~DL_FLAG_AUTOPROBE_CONSUMER; + link->flags |= DL_FLAG_AUTOREMOVE_CONSUMER; + } else { link->flags &= ~(DL_FLAG_AUTOREMOVE_CONSUMER | DL_FLAG_AUTOREMOVE_SUPPLIER); }