From nobody Mon Apr 6 12:13:31 2026 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (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 532AA3D16FA for ; Thu, 19 Mar 2026 11:59:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773921562; cv=none; b=RQBU441tEiG7RILjlWYDqVyIXJvcHDH7VElbVAXKFr02ldW6MLhPolMNYGntgOQH/rV8q+fhGvu0mZgbNN1eaqAdmkykxBZXZoTMWGm0USH1FSTnURTUx24GBnri2RBUV1ZXF9+PQiLg0ILtTwmYpW5t1Yxqu927dTrkB/ZDtXE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773921562; c=relaxed/simple; bh=egKHr0hohoUF1Y46/QK4pbAPf8UkacKpEmSV/fnmdIg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kx1rdkJvjLKD8kBK5A1jPeFWmLMcwCRVyA7LWziFIGEZ8LqA7Ca4Wm+zMLBFR80RihNYZWjwdAN27PTKxT493EETbuwiQTvMgqmTiSatxdjaNDHUMgo/h2ZdkgNNV/AxxYotW3gY3nAeWzL+W4ish7zwCMgUjW7CCkl1+1RW8iE= 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=GjrdSSgm; arc=none smtp.client-ip=209.85.218.52 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="GjrdSSgm" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-b9382e59c0eso131404866b.0 for ; Thu, 19 Mar 2026 04:59:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773921555; x=1774526355; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Dtlos7JIiB738v4Wa8FtbGBxNvY35k21oQSX4LVS2wk=; b=GjrdSSgmlb2KrbbOT6j+43Ru+iTKWJP24YhsLvvuE6FQf81yA4j2BvWIkRyDGknu/+ 7PH8nx7WcNBKDp1LDt4HGa+OY9yMp7mjwbae7tRzyoTAtT+0valqkhMwgDJOe+JHvEbS BYy+K0AyFJTBvXdVws352ZlStgUqX4OXH//QpqVl+te38byYNCzpRkz0lYtGdblkMy5I PQ1YPvGl1IgZkSdW2/oYGMjhhiF4bLGySEuYhGfpXyLdIbfEQM/l5qSjG6NhkCh0quAk 78m5OxBWwdHeUJCBt4TCzxkULbYXYPGkrYiwRSvxnm8Bg53vEggYy0iqBbmiaTmkY/To 5VOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773921555; x=1774526355; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Dtlos7JIiB738v4Wa8FtbGBxNvY35k21oQSX4LVS2wk=; b=CbKE6JcRciadirIy0rBLHt+fMfs3+fdq6JjYc/lHeIYuTRGL0fFILdltG22NuI12py /olUIkCpqBeFqt4q7/7Kit+3FVPqJXKuxAGwIkSQx/UwqqlJaXz10uAW9iPg4TFJQ/Dx P0GUggocLRz4agzf0re8iO+IbKw9J3XduPC9fyeLv1i2GZ2wywkD+nn5UUp8J7q3Ywbl XELjGK+E+neQWSUP4vr6MPOVlzw2msihRyJuQIGxhy76tlUIsB7F/OyCDigo0g92sn46 d2GCEv+HiO0UcKsWgSLnzxOuV1w2jJnUHLVTCOQxFiHJfU0G1jch2cDHyiBTVcWICYkC VNPQ== X-Forwarded-Encrypted: i=1; AJvYcCVrPc6QO5L/98XQU9i5JS69+Y11B+t6R9yBmU1vjKlveUii5UuXUDwH1JSVQl2yIwsC7TFfjQufi4qW3AA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyorn+LQUCTc1dp81QTEUYU4Pk6xIohmiWCJ8cRomkfZXDNjqXi xOjWT0BqajBCdZHA8zEO9D6hBmZ/WNyJx5BzLHTl7OSS0c3bl5BPBZ8z X-Gm-Gg: ATEYQzzC6/yDxBlEJWMo7M+lfeXEPH3sFxfAKlAW/8UHYvqiCkJkzFV3h4dzGWMLkmo NGIsw7618rnrsmf37t1DYfJasQ18KG4r4K0+dt8i66E7p58AAc2Uyvy2UU7fpgYyst6TW6Jv6dM Ji3C7R/Rnwbn11ivZFWoc0ZFD8yGLS2fdg4Q6OfyhHFAkECN8XFNEswhh5cmX9Y3vtEYs0/w1Ak Mde/LhaN5TmqpmbJOLZsQZsb0EOt4cgzhZpw0Rzui1HW9O/PMolPSXhwrRW7FiHCHEDJgWqoMj2 /jnykY3pURFpuOhXCGSao966/s66VPxKG89y8BwngFxS9/iYd7ucTW9Uoxcpk17nA3XhurlvdsY EXkq035JolSzylqfceYyATdTmG90HX0DyanR7W6of/O8+zGH3Ep433ElXclA4Ifg4jA8jde31eZ fSFa3MNmaWvlP1qkNBBDifwGsi1avbfr/Zxn5Y X-Received: by 2002:a17:907:60d5:b0:b97:cc05:61a7 with SMTP id a640c23a62f3a-b97f4aad93cmr479421466b.51.1773921554991; Thu, 19 Mar 2026 04:59:14 -0700 (PDT) Received: from [192.168.0.39] ([79.133.247.80]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b97f16d3380sm461399166b.42.2026.03.19.04.59.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 04:59:14 -0700 (PDT) From: Erikas Bitovtas Date: Thu, 19 Mar 2026 13:58:44 +0200 Subject: [PATCH v5 6/8] iio: light: vcnl4000: use variables for I2C client and device instances Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260319-vcnl4000-regulators-v5-6-a025d3332805@gmail.com> References: <20260319-vcnl4000-regulators-v5-0-a025d3332805@gmail.com> In-Reply-To: <20260319-vcnl4000-regulators-v5-0-a025d3332805@gmail.com> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Peter Meerwald Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Erikas Bitovtas X-Mailer: b4 0.14.3 After moving data->client and client->dev into variables of their own, replace all instances of data->client and client->dev being used in vcnl4200_init() and vcnl4000_probe() by the said variables to reduce clutter. Reviewed-by: David Lechner Signed-off-by: Erikas Bitovtas --- drivers/iio/light/vcnl4000.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index 76aee16d479b..34b52725aff6 100644 --- a/drivers/iio/light/vcnl4000.c +++ b/drivers/iio/light/vcnl4000.c @@ -361,14 +361,14 @@ static int vcnl4200_init(struct vcnl4000_data *data) int ret, id; u16 regval; =20 - ret =3D i2c_smbus_read_word_data(data->client, VCNL4200_DEV_ID); + ret =3D i2c_smbus_read_word_data(client, VCNL4200_DEV_ID); if (ret < 0) return ret; =20 id =3D ret & 0xff; =20 if (id !=3D VCNL4200_PROD_ID) { - ret =3D i2c_smbus_read_word_data(data->client, VCNL4040_DEV_ID); + ret =3D i2c_smbus_read_word_data(client, VCNL4040_DEV_ID); if (ret < 0) return ret; =20 @@ -378,7 +378,7 @@ static int vcnl4200_init(struct vcnl4000_data *data) return -ENODEV; } =20 - dev_dbg(&data->client->dev, "device id 0x%x", id); + dev_dbg(dev, "device id 0x%x", id); =20 data->rev =3D (ret >> 8) & 0xf; data->ps_int =3D 0; @@ -412,24 +412,22 @@ static int vcnl4200_init(struct vcnl4000_data *data) return ret; =20 /* Use 16 bits proximity sensor readings */ - ret =3D i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); + ret =3D i2c_smbus_read_word_data(client, VCNL4200_PS_CONF1); if (ret < 0) return ret; =20 regval =3D ret | VCNL4040_PS_CONF2_PS_HD; - ret =3D i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, - regval); + ret =3D i2c_smbus_write_word_data(client, VCNL4200_PS_CONF1, regval); if (ret < 0) return ret; =20 /* Align proximity sensor sample rate to 16 bits data width */ - ret =3D i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF3); + ret =3D i2c_smbus_read_word_data(client, VCNL4200_PS_CONF3); if (ret < 0) return ret; =20 regval =3D ret | VCNL4040_CONF3_PS_SAMPLE_16BITS; - ret =3D i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF3, - regval); + ret =3D i2c_smbus_write_word_data(client, VCNL4200_PS_CONF3, regval); if (ret < 0) return ret; =20 @@ -1992,7 +1990,7 @@ static int vcnl4000_probe(struct i2c_client *client) struct iio_dev *indio_dev; int ret; =20 - indio_dev =3D devm_iio_device_alloc(&client->dev, sizeof(*data)); + indio_dev =3D devm_iio_device_alloc(dev, sizeof(*data)); if (!indio_dev) return -ENOMEM; =20 @@ -2014,7 +2012,7 @@ static int vcnl4000_probe(struct i2c_client *client) if (ret) return ret; =20 - dev_dbg(&client->dev, "%s Ambient light/proximity sensor, Rev: %02x\n", + dev_dbg(dev, "%s Ambient light/proximity sensor, Rev: %02x\n", data->chip_spec->prod, data->rev); =20 if (device_property_read_u32(&client->dev, "proximity-near-level", @@ -2029,8 +2027,7 @@ static int vcnl4000_probe(struct i2c_client *client) =20 if (data->chip_spec->trig_buffer_func && data->chip_spec->buffer_setup_ops) { - ret =3D devm_iio_triggered_buffer_setup(&client->dev, indio_dev, - NULL, + ret =3D devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, data->chip_spec->trig_buffer_func, data->chip_spec->buffer_setup_ops); if (ret < 0) @@ -2038,8 +2035,8 @@ static int vcnl4000_probe(struct i2c_client *client) } =20 if (client->irq && data->chip_spec->irq_thread) { - ret =3D devm_request_threaded_irq(&client->dev, client->irq, - NULL, data->chip_spec->irq_thread, + ret =3D devm_request_threaded_irq(dev, client->irq, NULL, + data->chip_spec->irq_thread, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "vcnl4000_irq", @@ -2052,7 +2049,7 @@ static int vcnl4000_probe(struct i2c_client *client) return ret; } =20 - ret =3D pm_runtime_set_active(&client->dev); + ret =3D pm_runtime_set_active(dev); if (ret < 0) goto fail_poweroff; =20 @@ -2060,9 +2057,9 @@ static int vcnl4000_probe(struct i2c_client *client) if (ret < 0) goto fail_poweroff; =20 - pm_runtime_enable(&client->dev); - pm_runtime_set_autosuspend_delay(&client->dev, VCNL4000_SLEEP_DELAY_MS); - pm_runtime_use_autosuspend(&client->dev); + pm_runtime_enable(dev); + pm_runtime_set_autosuspend_delay(dev, VCNL4000_SLEEP_DELAY_MS); + pm_runtime_use_autosuspend(dev); =20 return 0; fail_poweroff: --=20 2.53.0