From nobody Sun Feb 8 18:15:40 2026 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 B4B7D270ED2 for ; Tue, 30 Dec 2025 20:35:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767126933; cv=none; b=NVTX4yRwQNala1xuRMYRuN+5azCMl4IwgyOr6dSI8wFyL6fpLE6dLbubmRxwPZcFV01/ceEgpxetD5LUJbCFq57N0emzBoWRsc1D6GfwBASWyGqib5+Z1Sqa3b4Fay+k/JZCBrXZCTei9Wf4z67vLhPx/4SC5f6UxGsIAo1eV+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767126933; c=relaxed/simple; bh=uLLykXd56vesJ9HtK213SAYa5HAGc3d+EtRYj3wel3Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qCiynYu7JfPP7pbO7wD/V9dl+TywBDX+YvkIP85xjjKjt3oC0bSRa6f92vBqkVfDyn0cF5lMUlr4maFK7l6ZwFdHN1CNrbscmpf45sa85Bf+TyRETMwdJfyuqiwYoXjtJsmnXBNii7v1umTTWqpGbNRqPhkg/L8kmmB9zaaC8Yc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HtS/r1bt; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HtS/r1bt" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-7e1651ae0d5so7979832b3a.1 for ; Tue, 30 Dec 2025 12:35:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767126931; x=1767731731; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D6EZZUu4o39Ojycy+6hXtm+M1PWmD2n3TmdY9kxESqw=; b=HtS/r1btgaGJXfiYFe9SRKa3B/X6yK6yHqH9xAnqcr7wdmz5iRkkVCkmCXJ8s05o08 zGlmOABeverShHNM0mhHtaeTVD1oDnA+qeLwab0GFjroJSU9VCAE4qsrBx4W/FqeOkkl b6oAJ9tM+J6sOTnMBnfcQ3u/UQlx+Y/6z5vmXnWejJl4C5zeDaQdTn1G+vLJS1flO0ao hXXR71D7EFebQ3CJDDtnsUg9nRKVAOPxFbMW0pEtQoOmiDfMWt7R0aqQoHfH1pUiSbH8 mLPekKHb0MBGl93LuVPaL5rHpMc26U6FJr8Ilc2QaUuIF7XsKepOOMd8F6/BGj6TEEj6 miYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767126931; x=1767731731; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=D6EZZUu4o39Ojycy+6hXtm+M1PWmD2n3TmdY9kxESqw=; b=nQhOWESfOwAjrPBeemrIAbRLvb43HL9jx8khPm2SKcP9WpcVoU8oyXz+4e08ueM+f8 C/BY/zKoVqLKmYPSUCHeNIE7Lc+IRF/IAMVtHhM6WGzKlMoEdMGNCH0T9Da+gV3bjGVH yEC/02y2127gw8FgvZaHfW3HwMCXHuU0M1N4uUEgey/jtt3xZHwNblU2zamhvG77cRpJ IjfGeHhIhM7TZyAAp7iWCU5OJ6L3IYoc47k3VkMtq9qDAw9OJW/0n9AoUZrGNlNsaQTy 5ZI9B1LybC9ITnfdk+iWMaMBjcmzmwFLigKV+lbbq6YXQ7Zy3k7s4hgq+pis1FmQQFC/ KywQ== X-Forwarded-Encrypted: i=1; AJvYcCVwKC5d42S9uOHsRLK7ou7mi6PwKXlGDSQq9FhtfDFNX6SFyo9+QAzYeSSLsWRjLVb+D1mGoD2VpaOepDc=@vger.kernel.org X-Gm-Message-State: AOJu0YxXBb5HaHoyu2XIyQugVLFSTOFc0TJOcxG/WOlP+uT05s7qXejU 7xJxpINdpsAeilEhSsrA5cn7SHVJcfVJ7nWjA9y18BosMo7GGpCjOQXx X-Gm-Gg: AY/fxX5FwBeRa0hah72mOd6APd0r9DSulcotttBtVIHNzVumT6KwvAkYnmlVquvMlTs xDbjsshBw5cVMyCEcUtYL2fc/nS2XnRfEhunEMH9Lbh8l0BXGVJnJULpz+AK5qAprqVydtFUpgV qayb9jFjOOvLrNCRrSuHlOH1317k1MthMv2EhByMiYafBAdDlt1lSC0aKhiIuZz+0aNf4pZFvUx 2jlljgrwAHOK+qB3zXz4pUDIhdy0D8r0azTzSTHJV/zv7/VJkP+vvU7L9TLISvsxEe4EgxyzBYa BAQvOSElFhjrTc8GSKxedgCRVQJjf6hKO2tkLnN1pjwjxTOweZTexgwvf2VKIx3G8RgSz0E8Y2C XjVyP7B/uXzIHqKHg5O03hfk3Yesd57ZAQBWBs+Vhc7y1IaUNe1z6e4rZjWdGdwoR/kKXmLpiq4 ZZ+S9Q6qk7fjlAqUh3ONj7nt5JT8oUmoU3xVvvRQoPxNM4D/b2AUr8ZTK6uziMcFCDbLBtHlnba u7SPx1PSjMOcP6J4sLAR5T+pZDgf4/zxa7uBSVZ16F5YGKM0NDBu2XVr8WDhyxRAonJtn8Jv3Wu 0if8XWA= X-Google-Smtp-Source: AGHT+IF+K7pA6VCVFKzIOiSozceFllQ94quSzKO77YM3movakFJsFMOcOUPfcfwEKoSQVCgPOYQFtQ== X-Received: by 2002:a05:7022:1e11:b0:11b:9386:8272 with SMTP id a92af1059eb24-1217231272amr33588237c88.47.1767126930864; Tue, 30 Dec 2025 12:35:30 -0800 (PST) Received: from Lewboski.localdomain ([181.191.143.75]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1217253c23csm128074981c88.9.2025.12.30.12.35.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Dec 2025 12:35:30 -0800 (PST) From: Tomas Borquez To: Jonathan Cameron , Greg Kroah-Hartman , Lars-Peter Clausen , Michael Hennerich Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, linux-staging@lists.linux.dev, Tomas Borquez Subject: [PATCH v2 2/6] staging: iio: ad9832: convert to guard(mutex) Date: Tue, 30 Dec 2025 17:34:55 -0300 Message-ID: <20251230203459.28935-3-tomasborquez13@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251230203459.28935-1-tomasborquez13@gmail.com> References: <20251230203459.28935-1-tomasborquez13@gmail.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" Use guard(mutex) for cleaner lock handling and simpler error paths. Signed-off-by: Tomas Borquez --- drivers/staging/iio/frequency/ad9832.c | 41 +++++++++++--------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/f= requency/ad9832.c index a5523e2210bf..35d8d51d5c2b 100644 --- a/drivers/staging/iio/frequency/ad9832.c +++ b/drivers/staging/iio/frequency/ad9832.c @@ -9,6 +9,7 @@ =20 #include #include +#include #include #include #include @@ -179,20 +180,20 @@ static ssize_t ad9832_write(struct device *dev, struc= t device_attribute *attr, =20 ret =3D kstrtoul(buf, 10, &val); if (ret) - goto error_ret; + return ret; =20 - mutex_lock(&st->lock); + guard(mutex)(&st->lock); switch ((u32)this_attr->address) { case AD9832_FREQ0HM: case AD9832_FREQ1HM: ret =3D ad9832_write_frequency(st, this_attr->address, val); - break; + return ret ?: len; case AD9832_PHASE0H: case AD9832_PHASE1H: case AD9832_PHASE2H: case AD9832_PHASE3H: ret =3D ad9832_write_phase(st, this_attr->address, val); - break; + return ret ?: len; case AD9832_PINCTRL_EN: st->ctrl_ss &=3D ~AD9832_SELSRC; st->ctrl_ss |=3D FIELD_PREP(AD9832_SELSRC, val ? 0 : 1); @@ -200,24 +201,20 @@ static ssize_t ad9832_write(struct device *dev, struc= t device_attribute *attr, st->data =3D cpu_to_be16(FIELD_PREP(AD9832_CMD_MSK, AD9832_CMD_SYNCSELSR= C) | st->ctrl_ss); ret =3D spi_sync(st->spi, &st->msg); - break; + return ret ?: len; case AD9832_FREQ_SYM: - if (val =3D=3D 1 || val =3D=3D 0) { - st->ctrl_fp &=3D ~AD9832_FREQ; - st->ctrl_fp |=3D FIELD_PREP(AD9832_FREQ, val ? 1 : 0); - } else { - ret =3D -EINVAL; - break; - } + if (val !=3D 1 && val !=3D 0) + return -EINVAL; + + st->ctrl_fp &=3D ~AD9832_FREQ; + st->ctrl_fp |=3D FIELD_PREP(AD9832_FREQ, val ? 1 : 0); st->data =3D cpu_to_be16(FIELD_PREP(AD9832_CMD_MSK, AD9832_CMD_FPSELECT)= | st->ctrl_fp); ret =3D spi_sync(st->spi, &st->msg); - break; + return ret ?: len; case AD9832_PHASE_SYM: - if (val > 3) { - ret =3D -EINVAL; - break; - } + if (val > 3) + return -EINVAL; =20 st->ctrl_fp &=3D ~AD9832_PHASE_MASK; st->ctrl_fp |=3D FIELD_PREP(AD9832_PHASE_MASK, val); @@ -225,7 +222,7 @@ static ssize_t ad9832_write(struct device *dev, struct = device_attribute *attr, st->data =3D cpu_to_be16(FIELD_PREP(AD9832_CMD_MSK, AD9832_CMD_FPSELECT)= | st->ctrl_fp); ret =3D spi_sync(st->spi, &st->msg); - break; + return ret ?: len; case AD9832_OUTPUT_EN: if (val) st->ctrl_src &=3D ~(AD9832_RESET | AD9832_SLEEP | AD9832_CLR); @@ -235,14 +232,10 @@ static ssize_t ad9832_write(struct device *dev, struc= t device_attribute *attr, st->data =3D cpu_to_be16(FIELD_PREP(AD9832_CMD_MSK, AD9832_CMD_SLEEPRESC= LR) | st->ctrl_src); ret =3D spi_sync(st->spi, &st->msg); - break; + return ret ?: len; default: - ret =3D -ENODEV; + return -ENODEV; } - mutex_unlock(&st->lock); - -error_ret: - return ret ? ret : len; } =20 /* --=20 2.43.0