From patchwork Thu Aug 22 16:48:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13773948 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A9CDEAC0 for ; Thu, 22 Aug 2024 16:48:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724345340; cv=none; b=CPPi+RCsgOwDw81GmrsrqR5AUl/QLIiIWf+8Yn5+4mhIh06jr9Jee1NjY3Budbp5lzKahylbskh8XddSFh+jV8N99EYupdMS0Aci6UU685oF2qgSOFBUePkNQgIpwGsZK/sM9kV7OO4XGpHtbPsTf+BXSh4oXWn8OB0zOvJlcGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724345340; c=relaxed/simple; bh=7ngHf1J/E6UZCdoJAqPhOYaHMASi62RNsv+4T02DVO0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=L8QMZO+aglHs9XGE7doL13Qjv04fW+XEbOoC9IYeojRJR1qkMof0oQyBfiPUmvP4230q5xHRclXlSPQjLscBiLFqCv3NMWmGHszim473HW85wDakDx6polycxSU8kC7ODEq0qWYjrm1mRxJQF382nnGXcxIyjBMSVVAEXclbnKM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=RYm7BRAw; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RYm7BRAw" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-42808a69a93so1798915e9.3 for ; Thu, 22 Aug 2024 09:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724345337; x=1724950137; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=y/uPrqpj9NK/aRR9ivkQ1oqXqgAV9rXCTBKB3mCN+LQ=; b=RYm7BRAwR5CkQB3l/m7hKFnJKN0nRlDe4RjH2DdwTRLMj1DyhrKySKRT4mkIpDKHFM I1fezT/ADd8gAztFO3MByqrwZzoiKN0RSadf0NnuHrGzOK7Rvr1Qxo/MMNN0J9rOMxZC bB2C+ftYBxJw8G3LnwlX2lD1nwWjjMfxK2Nz2NO//Nu8C+hljLA6K2UqR34LFp/cxjgC BY+JKHyxo3mOZyg2BqIrdEFH7vleZ/jJ+gpPqi3tzcGYFjCRoLlsj7/tuUxpQEj+IwRc wjXYqEOB7QrIvoTTV9fz5rEVwNm0xZPwdoUf49qXN1HJl+pM4/fiOWSUcT/i7V3beGnD 4tmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724345337; x=1724950137; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=y/uPrqpj9NK/aRR9ivkQ1oqXqgAV9rXCTBKB3mCN+LQ=; b=hETCzuzx+fYzPNVIot39M7/pp3detzgTh0SEZ3gmOkl2dry+G5OU89dofvuixNOVlC APddxa1Uu071RWAoF0fwzm/rVSyX87IxQWaZDtO4OShu7W2F/WbpvMKnnrmmBlogk0Xr fQdE9K+eE8Iprlj/A8JwTYkXMYCBy/EuTe0z06U/9A7pmdJ6kQ3mHML+4UZ39B3avksS TLpxmiI/Wmr7EzWulpe5PmgYqrgcfJb0Egb/QuHvY7sLF38+bEzjaiJqGejpVgGyJqfv ZcjFAZr8iPOGyBsKYNKeFI5pF4YqXll78Z4KMZBdWJZU1n0/DoOkLGmP3obOnFsxwqGU 9L/Q== X-Forwarded-Encrypted: i=1; AJvYcCUoN5FKXqn/j8/JVNyWtdACNMzdrMP2YkkrtybKzx0t/qFZSysUWKpvw9JPlO3+2L5YY9rAgsID4Tu0x53X@vger.kernel.org X-Gm-Message-State: AOJu0YxMZaGJ5kMgvdqCmBzLY4iEcFCCWjR+Jp40uTj94bK0pSNcu2F6 CHbEuaK1a0MOCHlZ/dhGPnUdxs3YCVOA52pXLPPGYaYil2zZfCINcPVg26FNrtQ= X-Google-Smtp-Source: AGHT+IFUODpqlZ8UTaxs48M78/4DVqeVEA2pz7iAWCpAl+BVIKgEuEHkLXgg2dsPoJkUiatJ7UoLvQ== X-Received: by 2002:a05:600c:4fd0:b0:424:8b08:26aa with SMTP id 5b1f17b1804b1-42abf0f7f81mr29841885e9.3.1724345336612; Thu, 22 Aug 2024 09:48:56 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.82]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42abefc627asm68062765e9.34.2024.08.22.09.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2024 09:48:56 -0700 (PDT) From: Krzysztof Kozlowski To: Bjorn Andersson , Konrad Dybcio , Andy Gross , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/3] soc: qcom: pmic_glink_altmode: simplify locking with guard() Date: Thu, 22 Aug 2024 18:48:50 +0200 Message-ID: <20240822164853.231087-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Simplify error handling (less gotos) over locks with guard(). Signed-off-by: Krzysztof Kozlowski --- drivers/soc/qcom/pmic_glink_altmode.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c index 463b1c528831..bd06ce161804 100644 --- a/drivers/soc/qcom/pmic_glink_altmode.c +++ b/drivers/soc/qcom/pmic_glink_altmode.c @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include @@ -114,7 +115,7 @@ static int pmic_glink_altmode_request(struct pmic_glink_altmode *altmode, u32 cm * The USBC_CMD_WRITE_REQ ack doesn't identify the request, so wait for * one ack at a time. */ - mutex_lock(&altmode->lock); + guard(mutex)(&altmode->lock); req.hdr.owner = cpu_to_le32(altmode->owner_id); req.hdr.type = cpu_to_le32(PMIC_GLINK_REQ_RESP); @@ -125,18 +126,16 @@ static int pmic_glink_altmode_request(struct pmic_glink_altmode *altmode, u32 cm ret = pmic_glink_send(altmode->client, &req, sizeof(req)); if (ret) { dev_err(altmode->dev, "failed to send altmode request: %#x (%d)\n", cmd, ret); - goto out_unlock; + return ret; } left = wait_for_completion_timeout(&altmode->pan_ack, 5 * HZ); if (!left) { dev_err(altmode->dev, "timeout waiting for altmode request ack for: %#x\n", cmd); - ret = -ETIMEDOUT; + return -ETIMEDOUT; } -out_unlock: - mutex_unlock(&altmode->lock); - return ret; + return 0; } static void pmic_glink_altmode_enable_dp(struct pmic_glink_altmode *altmode,