From patchwork Wed May 1 21:57:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Harrisonn X-Patchwork-Id: 13651151 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.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 E321B165FD6 for ; Wed, 1 May 2024 21:57:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714600670; cv=none; b=BNQA+gzyUm6ZUW6PV3ZFB/ubDPkdnCv/ydSa24MFmISjexkjVIhG/PEV2/z7x10w2hYVfnhFxPNfIE+sqNA7MXtuuqOKiuMlq4FNqvBPvE/xzRgrzcUYFlSwxmUBB/Ic+UI4JEVkYpMmCCk5Vaq7nFWqZ1ajX3ctJhsRbFX68rU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714600670; c=relaxed/simple; bh=85q0tifsi/ZuyVB/GgI9ADumbYXEGf7MqN589kwsqLM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ipJ3xGdMh/WqIK7bn2xJCwhd0rxsWHWukL3ld+IIV2Xd2jcuy9wI9bWYrfBE2s++zZZf1zprnEhqEef+o38WCizDhTo/8v5Wr67ufhkcSucva937BtTvKmvil81K3k+Cf3S93ogkowhq0tmb8JYC7krU8V0My5/DT5eaoZRNWP4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=usp.br; spf=pass smtp.mailfrom=usp.br; dkim=pass (2048-bit key) header.d=usp.br header.i=@usp.br header.b=WJ0MDWcW; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=usp.br Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=usp.br Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=usp.br header.i=@usp.br header.b="WJ0MDWcW" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1ecd9dab183so1941315ad.1 for ; Wed, 01 May 2024 14:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; t=1714600668; x=1715205468; 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=liA+N999r9bzQdbuy7djyarhfhemj80TYrbbaFh4LiE=; b=WJ0MDWcWb/i+3q/Kag3ECG2z5b7EoCCox20EeNjma0DOc8jQbQmM4dH2InDjzw+Kda Gbuhka0vwRJbNZwfTqrTAeZbQ07MkVJhM+IIpVOodL3ki4YMJTJQHPWc8CyJNhrR0IxB LT33M51MSHuOTyEKq+EoJ4uQ2TBReqmZKnRZ9gUIUXsHr81dWBHmc0eG0UGSAYQEVBlz QF7au4knrcyy4eTiaI6/6kTbJ4O1Fhqcvvz4DxF62gOlkQeOHLJL5kSpBf4o1NadJdVY +JEncIx+tlEBUbIKIzwvlGhk5P8GhLZ0Pcxbo1gAJf7nu4ySaQMtuFl8pQySjVcPuSwC trWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714600668; x=1715205468; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=liA+N999r9bzQdbuy7djyarhfhemj80TYrbbaFh4LiE=; b=Vc6yh/obEA63hNigkbV/wO4CjBoscajl4Dgbtgo1h6oTO9ZNn7gdOCfzSSd/BBJwHx v908gUsyUaZaQnRRPZPx0M9bwWpO3PHRzX77NMB3mx2HbtjexSEcsufpzWBS/Lw+AV+Q +tNH4/BEvSaw22T1vTq0rdD5n1QGGTnnynmmdttuRUbWzqiiexobD72EV0s9d6pFX4Rc /Lzcr/fMgBF4h6w/gbXndSbgRr0uQm7VnHwmCc2zszmgXAqlU6REw7xF9VECpgos8Iaj wp+H0wuVT1zeVVMejPG5jJ8fN8kDSTbLN695uobelMx3okHnAXiptQrFW58oJ/qVxsmz aJiw== X-Forwarded-Encrypted: i=1; AJvYcCWjS8k8XeV49yU+Hn4ONkTnDzO9SXEmAKBf+Mayznx3Ew2omn3c/urllnhHz44ZOqx7Z4nTuBGd2Jblc11pB/9nXBHPx5AE8eEu X-Gm-Message-State: AOJu0Yy532fjXMejG4tq2+3hsAfAvj3+sCW9gt41wTGkgOdDorGJ3WzX uqKJd1Gqquffy/3iS9Ey6kxvg3scJeC5zB3HB6WwZrsBfXFO5F/DAHqMfsb/vH8= X-Google-Smtp-Source: AGHT+IFAYI1TjC9m2O0A+NLCtQ7DkOKK944/vmZckq1Oir19NSXnSbP1R7+CwfYA09TFN+xseYv4Xw== X-Received: by 2002:a17:90b:1298:b0:2a5:5f9f:6733 with SMTP id fw24-20020a17090b129800b002a55f9f6733mr1240580pjb.20.1714600668154; Wed, 01 May 2024 14:57:48 -0700 (PDT) Received: from Rigel.pinscher-bonito.ts.net ([2804:14c:34:2097::6c7]) by smtp.gmail.com with ESMTPSA id y5-20020a63fa05000000b005cf450e91d2sm22919843pgh.52.2024.05.01.14.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 14:57:47 -0700 (PDT) From: Jorge Harrisonn To: jic23@kernel.org, lars@metafoo.de Cc: Jorge Harrisonn , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, laisnuto@usp.br Subject: [PATCH 1/2] iio: adc: ad7606: using claim_direct_scoped for code simplification Date: Wed, 1 May 2024 18:57:23 -0300 Message-Id: <20240501215724.26655-2-jorge.harrisonn@usp.br> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240501215724.26655-1-jorge.harrisonn@usp.br> References: <20240501215724.26655-1-jorge.harrisonn@usp.br> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Using iio_device_claim_direct_scoped instead of calling `iio_device _claim_direct_modeand later callingiio_device_release_direct_mode` This should make code cleaner and error handling easier Co-authored-by: Lais Nuto Signed-off-by: Lais Nuto Signed-off-by: Jorge Harrisonn --- drivers/iio/adc/ad7606.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index 1928d9ae5bcf..fa989e0d7e70 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -174,17 +174,14 @@ static int ad7606_read_raw(struct iio_dev *indio_dev, switch (m) { case IIO_CHAN_INFO_RAW: - ret = iio_device_claim_direct_mode(indio_dev); - if (ret) - return ret; - - ret = ad7606_scan_direct(indio_dev, chan->address); - iio_device_release_direct_mode(indio_dev); - - if (ret < 0) - return ret; - *val = (short)ret; - return IIO_VAL_INT; + iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { + ret = ad7606_scan_direct(indio_dev, chan->address); + if (ret < 0) + return ret; + *val = (short) ret; + return IIO_VAL_INT; + } + unreachable(); case IIO_CHAN_INFO_SCALE: if (st->sw_mode_en) ch = chan->address; From patchwork Wed May 1 21:57:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Harrisonn X-Patchwork-Id: 13651152 Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) (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 30445168AF9 for ; Wed, 1 May 2024 21:57:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714600674; cv=none; b=loe2OZz/YkdYAOynRHs+9RI4qfQ6f3cQ4FAjIceUFyJsS6dSTFawYfTFRsOFhjimm1jYeSZzJm+wFWCnnYP5PKm7SvkIl9vfX0oF9P9GTPUq4txvq868IyaZLBuWS3yb7rD8eIdfGWzDnyvYLzvGsGYPhuLPmPIlRBf+6GK2048= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714600674; c=relaxed/simple; bh=xQBDyYq+q7mrO43UsmzsJAEVIv0sNrh7F1MXl1TVyhU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SusPJCAkX+4x9BzNk4VEzS9a5YGdvSDLFqtMef+Btmd4FuFHlYfX/13fRW7uGnapaS6Xq2XzfMVuJQW6pget9+xlolRPQOcvLRDvEPshmNIV+fTJRQSTgKD5CaoxNQMZjXeGicm4c9u0vhvJpOHnp4+OgNeOASwMNYu4WvAXRPY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=usp.br; spf=pass smtp.mailfrom=usp.br; dkim=pass (2048-bit key) header.d=usp.br header.i=@usp.br header.b=KwBizn21; arc=none smtp.client-ip=209.85.166.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=usp.br Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=usp.br Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=usp.br header.i=@usp.br header.b="KwBizn21" Received: by mail-io1-f44.google.com with SMTP id ca18e2360f4ac-7dee37ea263so94396839f.2 for ; Wed, 01 May 2024 14:57:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp.br; s=usp-google; t=1714600671; x=1715205471; 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=lJ8W7jumY+a3Z7Yvkg0jJPfeRZ8DJgpTlOFfp0kNYS0=; b=KwBizn21coqS1sWuzU9/sbZbDflwj0HqI3tO9r+DmMZFKMR7d+FpFXNmLUWmVoucnL eu/4oQBbA0PnODSoYNZjn447rY1302gsLrqwe4SyVC83KzFRjPerWvST4lf/UPOGKoVc fOnLRtwBQ2+ouXfDfFbGWqbPE9TnE2pGUINVLvwa/R2iDa+Yljs+ePWftPhyXTP1bg29 vk2zoqZT0+sASw9CSwqcwHM2MG4FHJPaPJkiZXPqWjSl3Q5S97yNq2rzSfTLvQovMrJX n2OI6d7TmZ1YokBheQbQYeQynztfHB5fI+T+/Ngt3gRWzC2PNWS49yUE+6fIXdNZL7NA IzeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714600671; x=1715205471; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lJ8W7jumY+a3Z7Yvkg0jJPfeRZ8DJgpTlOFfp0kNYS0=; b=NzKEMITFtImylQAGFstJcCI3LVOis1LqgyYy3TxTZq8OIV2/EP7qUGWvyaKQwGM7U+ 9veDTyMTlcuTcHivbX9oNw/r4/kIb6WTuFLP04D+qVdBGfNer8oetpeQdKjPpgwjAsyp 8NaYHoQwJzV8x/X1R48f7qPWfM6BNHiAnHkzaS7LmZc/TiG4N06eg3LKPlrXp33uBw6O P8Oie/JIwHoz1F7fzO4FjOEzmdMzzy6ZHpKa5MLJPsKdr5TmBX+8u7cS8EgWFwPfBmrI jl6vFbEkB9+u/V2Vaja4NDFtqH4Wn/roHOAE6h1uGII3NeKJDifHPMqMbHcmHgL3Rg5T eVJw== X-Forwarded-Encrypted: i=1; AJvYcCUbLsSrmjfhCy5WZbRN2TKTlkGq5rnyFHauZFbpoqCAWJg/FSPa3q5Z4Lzztn+CzEws3/Ro5uYl0OgDipmq6FuR+tn4Gw+rbkAC X-Gm-Message-State: AOJu0Yxvmb8acCeet2NILv8I27xsAFauD/+kodj45vramLlbn2cFr8ze N2UU6PlhTFx0eKLAO2ZOEscYN/H8CNYPhHr/7SLCCqASuKQQE7NIxLVWCHwS2bQ= X-Google-Smtp-Source: AGHT+IHqU/KfTKnIiExWiOo0mDLyusJfvwwGprsq5KSU4nxd303ePIGAGM323MyiBXfTrxpmawhTNA== X-Received: by 2002:a05:6e02:1c2a:b0:36c:5124:eb35 with SMTP id m10-20020a056e021c2a00b0036c5124eb35mr4551489ilh.3.1714600671159; Wed, 01 May 2024 14:57:51 -0700 (PDT) Received: from Rigel.pinscher-bonito.ts.net ([2804:14c:34:2097::6c7]) by smtp.gmail.com with ESMTPSA id y5-20020a63fa05000000b005cf450e91d2sm22919843pgh.52.2024.05.01.14.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 14:57:50 -0700 (PDT) From: Jorge Harrisonn To: jic23@kernel.org, lars@metafoo.de Cc: Jorge Harrisonn , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, laisnuto@usp.br Subject: [PATCH 2/2] iio: adc: ad7923: using claim_direct_scoped for code simplification Date: Wed, 1 May 2024 18:57:24 -0300 Message-Id: <20240501215724.26655-3-jorge.harrisonn@usp.br> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240501215724.26655-1-jorge.harrisonn@usp.br> References: <20240501215724.26655-1-jorge.harrisonn@usp.br> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Using iio_device_claim_direct_scoped instead of calling `iio_device _claim_direct_modeand later callingiio_device_release_direct_mode` This should make code cleaner and error handling easier Co-authored-by: Lais Nuto Signed-off-by: Lais Nuto Signed-off-by: Jorge Harrisonn --- drivers/iio/adc/ad7923.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/iio/adc/ad7923.c b/drivers/iio/adc/ad7923.c index 9d6bf6d0927a..a646521b2ef3 100644 --- a/drivers/iio/adc/ad7923.c +++ b/drivers/iio/adc/ad7923.c @@ -260,22 +260,20 @@ static int ad7923_read_raw(struct iio_dev *indio_dev, switch (m) { case IIO_CHAN_INFO_RAW: - ret = iio_device_claim_direct_mode(indio_dev); - if (ret) - return ret; - ret = ad7923_scan_direct(st, chan->address); - iio_device_release_direct_mode(indio_dev); - - if (ret < 0) - return ret; - - if (chan->address == EXTRACT(ret, 12, 4)) - *val = EXTRACT(ret, chan->scan_type.shift, - chan->scan_type.realbits); - else - return -EIO; - - return IIO_VAL_INT; + iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { + ret = ad7923_scan_direct(st, chan->address); + + if (ret < 0) + return ret; + + if (chan->address == EXTRACT(ret, 12, 4)) + *val = EXTRACT(ret, 0, 12); + else + return -EIO; + + return IIO_VAL_INT; + } + unreachable(); case IIO_CHAN_INFO_SCALE: ret = ad7923_get_range(st); if (ret < 0)