From patchwork Fri Apr 5 10:46:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Subhajit Ghosh X-Patchwork-Id: 13618863 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 9EDF91474DC for ; Fri, 5 Apr 2024 10:47:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712314024; cv=none; b=pbb+29cd359alMZug9r9npr93ckCOUIBM9i6TMv2Rd1bbmDasidBa1P/LG9kmpknxl0IETMeXweVbuMTrX9i8/av6MSGa8KchPrV77SVg5+zO4b8NwLqF0a8312W4XurcDq33sQx21HM1BQCeMG6sWqKoJ5x8lhDYlfpU8sM9Zs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712314024; c=relaxed/simple; bh=SWszhvXa67B7cNMYOtTQ0pmGiq2oS/UZEJSvIsf/7DM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=FPMAEJRjKruPCynJW0VZ3MI7LpS94QBE7lrGGMqzQqaKOBQphoVVbDQges0B9cxqWlLVT6LVGtlRls39wV5FwNLFI+iRfujK1u0R+y2L56aGOQ6pqFl9+DsBMglFP369PScTKm065747qWubD2ljJDao9+pdWU2rlnOlbt0UM68= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tweaklogic.com; spf=pass smtp.mailfrom=tweaklogic.com; dkim=pass (2048-bit key) header.d=tweaklogic.com header.i=@tweaklogic.com header.b=YdLFLAO4; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tweaklogic.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tweaklogic.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tweaklogic.com header.i=@tweaklogic.com header.b="YdLFLAO4" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1e0878b76f3so17182225ad.0 for ; Fri, 05 Apr 2024 03:47:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tweaklogic.com; s=google; t=1712314021; x=1712918821; 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=IW8WLsRqELRhGrnpFkB77O+jHrEv6LQ5ewlzXkr+zIU=; b=YdLFLAO4JPsy7gNWRDrojfljWO8vbjR12m/9yVwab1csUwy7XL+kC0B5TbCJoXXWuc LYzN9KhloiJ0GwSKtQ5fcK/Vf3sWAGH/WVKFZqSAsWFTku8TJL0GoCEII3NR4twPs8m+ 4cS5xsoYeyYVtZ43UqhAeu1PoZ4C6vUXcRfvzJXk6G60UVWz/BcPDFLdWVs74zu18DSp gycit9a2M/WavsIJdy2/F/bERu0wIayLIGW6LStVUfYJEyBM6tER6EAGCuse8JqlqOD8 s0t3L1gmLw20U3nWWXzARuIu9Apz6qBb+3lJhHou3XnLf52kGDT0EOhFeviCGvkVYN1h QPTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712314021; x=1712918821; 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=IW8WLsRqELRhGrnpFkB77O+jHrEv6LQ5ewlzXkr+zIU=; b=qIiz7iPafdkf8t+s3LhP5LLFEjHRZm+8XUfjL3GqO75Jb9thA7Q0WVXF8doPuBBZVs DmKCNx6zOpf5X6kpjg/FVZgm8M9Jdcyvk6vL/uMrNFvwfS3Dpj5/nJicfCwRUmqXxQRR cWqa/ZW3USc1ylrbnbn8NZQ99dHjzw6KVh9RmlB8EeeNmWqZg1X2maC4PWUWbHGdMRR+ 7GWBMgJBYqgWZrc30w29SAaUZToWsAOxdaOov8vCuDK/0xxCPON4Prq9L0IZUR0ZbCob kzyZn66zWbo4bHa62sLwSx+Y/J7fpbptHwpaaI9zhkiQbFPwNvDf5jQlnHMfbtny9Dot uaUA== X-Forwarded-Encrypted: i=1; AJvYcCX98Tohe9k8FYSmvAiBV7PoBzHRznG4I9Z+a0T29sFH/WmxTrrsDbe90qfEoxq/jSIAXmOXwaHatIh65K3T9A6QeG+jngU3iYdV X-Gm-Message-State: AOJu0Yz4JjC66YrkUOIOYuYrezdOoI0k6/TwS+QfSalMSF46jHgei2x9 7KIshOfwXrA4CGWf4dgeC5QV6OexPSn3YUw61lxQeSYT6ayQ7mpeB/jTVvQl1XA= X-Google-Smtp-Source: AGHT+IEFdxo+UkKJYR9DhEbyIb4LCwpePH5hfHpch1oPI/VPdBqWu/Z938189HTj+SyV2nQxc8ZZlw== X-Received: by 2002:a17:902:f0cb:b0:1e2:9c52:4757 with SMTP id v11-20020a170902f0cb00b001e29c524757mr2262263pla.14.1712314020854; Fri, 05 Apr 2024 03:47:00 -0700 (PDT) Received: from localhost.localdomain ([180.150.112.31]) by smtp.gmail.com with ESMTPSA id y20-20020a170903011400b001d8f81ecea1sm1257947plc.172.2024.04.05.03.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 03:47:00 -0700 (PDT) From: Subhajit Ghosh To: Jonathan Cameron , Lars-Peter Clausen , Dan Carpenter Cc: Subhajit Ghosh , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] iio: light: apds9306: Improve apds9306_write_event_config() Date: Fri, 5 Apr 2024 21:16:41 +1030 Message-Id: <20240405104641.29478-1-subhajit.ghosh@tweaklogic.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Simplify event configuration flow. Suggested-by: Jonathan Cameron Link: https://lore.kernel.org/all/20240310124237.52fa8a56@jic23-huawei/ Signed-off-by: Subhajit Ghosh --- drivers/iio/light/apds9306.c | 48 ++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 21 deletions(-) base-commit: 526f7f17b651c78ead26fea7cea20948c00e47a5 diff --git a/drivers/iio/light/apds9306.c b/drivers/iio/light/apds9306.c index 4d8490602cd7..465b6957682b 100644 --- a/drivers/iio/light/apds9306.c +++ b/drivers/iio/light/apds9306.c @@ -1075,14 +1075,16 @@ static int apds9306_write_event_config(struct iio_dev *indio_dev, { struct apds9306_data *data = iio_priv(indio_dev); struct apds9306_regfields *rf = &data->rf; - int ret, val; - - state = !!state; + int ret, enabled; switch (type) { case IIO_EV_TYPE_THRESH: { guard(mutex)(&data->mutex); + ret = regmap_field_read(rf->int_en, &enabled); + if (ret) + return ret; + /* * If interrupt is enabled, the channel is set before enabling * the interrupt. In case of disable, no need to switch @@ -1091,38 +1093,42 @@ static int apds9306_write_event_config(struct iio_dev *indio_dev, */ if (state) { if (chan->type == IIO_LIGHT) - val = 1; + ret = regmap_field_write(rf->int_src, 1); else if (chan->type == IIO_INTENSITY) - val = 0; + ret = regmap_field_write(rf->int_src, 0); else return -EINVAL; - ret = regmap_field_write(rf->int_src, val); if (ret) return ret; - } - ret = regmap_field_read(rf->int_en, &val); - if (ret) - return ret; - - if (val == state) - return 0; + if (enabled) + return 0; - ret = regmap_field_write(rf->int_en, state); - if (ret) - return ret; + ret = regmap_field_write(rf->int_en, 1); + if (ret) + return ret; - if (state) return pm_runtime_resume_and_get(data->dev); + } else { + if (!enabled) + return 0; - pm_runtime_mark_last_busy(data->dev); - pm_runtime_put_autosuspend(data->dev); + ret = regmap_field_write(rf->int_en, 0); + if (ret) + return ret; - return 0; + pm_runtime_mark_last_busy(data->dev); + pm_runtime_put_autosuspend(data->dev); + + return 0; + } } case IIO_EV_TYPE_THRESH_ADAPTIVE: - return regmap_field_write(rf->int_thresh_var_en, state); + if (state) + return regmap_field_write(rf->int_thresh_var_en, 1); + else + return regmap_field_write(rf->int_thresh_var_en, 0); default: return -EINVAL; }