From patchwork Thu Jun 9 08:32:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 12875008 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A35BAC43334 for ; Thu, 9 Jun 2022 08:36:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=s6hwOHVQRjOPNtC/gGB6TW3m/qUcU29cIFKiQErRWpk=; b=X6yw286MWcPe4h N816aXUac4Yoyx4hsDFTkMEr5afjpMKkmaEZWMm+YBVG4bmdXY09UBSuz0ZHkE5J4ACSrR1Y5BI+k HZD/voR2GeRcRLzg2hBZjV6PSSamfFtfORhZ/f+vgPAH8RZfsW2JitQu2UO/OQIB916Ej2lXPaJ9h 3fHF+2FETIJmsTVg9sV96T9JhcfHGgVNI5gnM4AUaZWlqSyjekJSLedAw93lFemkvubuowQhb6jMg d63z6Mflv5Q4zwUJam7yT+TOA3cdRtRTI3wq/drjeqgBaXWgtR+giZP3GSRGxamdmvgcw0hb7gNIO lzqz0ZXglHdEWOwqKiGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzDdJ-000Hcf-8S; Thu, 09 Jun 2022 08:35:13 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzDYe-000FS3-4y for linux-arm-kernel@lists.infradead.org; Thu, 09 Jun 2022 08:30:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1654763424; x=1686299424; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wCSIkkvazbTh0QE+i1AwpXua1EMs/hRmfnwnVg4TM+w=; b=iV1GLYsYn15TrGrCM/JUa862Jagh6B0gqWxf6uk1q/xWbRUSBC1c2zEP CUbj70nkiJo1eYTygrUZlRDoV7jbhqsWSqo/J1S+L9n+hh8ACekjh58Hy qlfKlVcJ8BkGIFP/exzbrJNh2tokCxtICTIfuZMteciEdOXq4x6iBQBBG QBLGFtsQQ9Co6LSfQDIlitvGRD9n+twakfzDiziANQ1MMhtCm2FhWWEv3 PB41y9UFK7XAkDpdjckxziI+kl2LBqhcyfkgKOELR6MTLiOUsOscehv42 JlDayKeGulb8xVhKE3VDaCfafeFEVDkwVCIEpjwFjtIjEP6aRAYm/4D6/ Q==; X-IronPort-AV: E=Sophos;i="5.91,287,1647327600"; d="scan'208";a="99259942" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 09 Jun 2022 01:30:21 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.87.72) by chn-vm-ex02.mchp-main.com (10.10.87.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 9 Jun 2022 01:30:17 -0700 Received: from localhost.localdomain (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Thu, 9 Jun 2022 01:30:14 -0700 From: Claudiu Beznea To: , , , , , , , CC: , , , , Claudiu Beznea Subject: [PATCH 07/16] iio: adc: at91-sama5d2_adc: simplify the code in at91_adc_read_info_raw() Date: Thu, 9 Jun 2022 11:32:04 +0300 Message-ID: <20220609083213.1795019-8-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220609083213.1795019-1-claudiu.beznea@microchip.com> References: <20220609083213.1795019-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220609_013024_324975_8A9CA698 X-CRM114-Status: GOOD ( 11.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Simplify a bit the code in at91_adc_read_info_raw() by reducing the number of lines of code. Signed-off-by: Claudiu Beznea --- drivers/iio/adc/at91-sama5d2_adc.c | 35 +++++++++--------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c index b52f1020feaf..fbb98e216e70 100644 --- a/drivers/iio/adc/at91-sama5d2_adc.c +++ b/drivers/iio/adc/at91-sama5d2_adc.c @@ -1576,6 +1576,7 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val) { struct at91_adc_state *st = iio_priv(indio_dev); + int (*fn)(struct at91_adc_state *, int, u16 *) = NULL; u16 tmp_val; int ret; @@ -1583,29 +1584,18 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev, * Keep in mind that we cannot use software trigger or touchscreen * if external trigger is enabled */ - if (chan->type == IIO_POSITIONRELATIVE) { - ret = iio_device_claim_direct_mode(indio_dev); - if (ret) - return ret; - mutex_lock(&st->lock); - - ret = at91_adc_read_position(st, chan->channel, - &tmp_val); - *val = tmp_val; - ret = at91_adc_adjust_val_osr(st, val); - mutex_unlock(&st->lock); - iio_device_release_direct_mode(indio_dev); + if (chan->type == IIO_POSITIONRELATIVE) + fn = at91_adc_read_position; + if (chan->type == IIO_PRESSURE) + fn = at91_adc_read_pressure; + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) return ret; - } - if (chan->type == IIO_PRESSURE) { - ret = iio_device_claim_direct_mode(indio_dev); - if (ret) - return ret; - mutex_lock(&st->lock); + mutex_lock(&st->lock); - ret = at91_adc_read_pressure(st, chan->channel, - &tmp_val); + if (fn) { + ret = fn(st, chan->channel, &tmp_val); *val = tmp_val; ret = at91_adc_adjust_val_osr(st, val); mutex_unlock(&st->lock); @@ -1616,11 +1606,6 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev, /* in this case we have a voltage channel */ - ret = iio_device_claim_direct_mode(indio_dev); - if (ret) - return ret; - mutex_lock(&st->lock); - st->chan = chan; at91_adc_cor(st, chan);