From nobody Tue Apr 7 05:43:35 2026 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 BF9143D4131 for ; Mon, 16 Mar 2026 17:19:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681601; cv=none; b=uK2t9188N51+Vzv5EhG56asJWfOHWonp/Bmighenp1sNKlEw5B5Ihdu4nfEmbRGIjeKOgBwZABkZqNOBnfcENp8AQtRYYNUo/Ana+WVAzBNDHFH0HnFID+Lz1qP05f14d7xuA87FkMFkHJeomwwBPUt/lvP4/Q4rkZZG9tf7SXg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681601; c=relaxed/simple; bh=R6JJNuzHldqhmL0cT6TJNLfm8et18/BjP7zu6n32s78=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hGfY23vTwYDDwUJlNzcUNiN9WBA8DQPqO9OBn3nZajvGdPbHZnVjDqAAYh8+r6WyMlGNFibgdecG7U6rDDqkh/eVE2LB71TCeNMVI7zaTUWvMfkZ46MBEtRa0TzexTQTwKHTAT40Wl3uGiQILHAbOMi6Pdr8awvZuGpEjnqw/EM= 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=HCFq8+hq; arc=none smtp.client-ip=209.85.218.49 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="HCFq8+hq" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-b976536806cso590611966b.0 for ; Mon, 16 Mar 2026 10:19:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773681598; x=1774286398; 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=+Pk3Hh6DzxINjbi6c9eEVbOAYCxG55sTKC9+jA3jbVA=; b=HCFq8+hqMXgzbt/2zeyqCXmplmmZqeBlD49pWb+k3wvkx3lcIKKpQriNVUOmMcN+LZ d5FmLMi+dtzV/MHeCnobJQH4nWSUrKjW6cBdPdlhQ2vB10An89TZ0MQc5wilhXij+iir yi0FaN8nGn+6FbgMDJTdJ8XkuqcBMAleYCJkkvMWU6uKmPTDGSMoFbIew24XMidaMYZA WUOUofNR61BdDonfynlm6grUdFJn/sNecQoIq1JwZMKbfwava54tNQ91GMZx/OFzoCS1 dbW8DxpXoDhtPM7xP7I4YAsHEoN46IMV3EksKOjlNzZxg62jv/mOdIgXyaKAbYc+KHsu uEag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773681598; x=1774286398; 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=+Pk3Hh6DzxINjbi6c9eEVbOAYCxG55sTKC9+jA3jbVA=; b=O4igEl/+7dSCqhNUrR7vRQkQK6Ub9aCHFEf+35EI7JI9h6R1PP6Ttgb0pycEFzmdWW sUxXTFJYr/a4RBiMFXB/uSnq7qajQ/wKjYKYEPj6Zkb5gKeLzKSBhIY6U27qZUz2lUTS +1G9NtKX4cl2/xabk/APDXKSqPje95sLGAJVEx2Fm9AfQcQw/4irPsbyQLXQmWb2LVfy +x3aYeYWhJJjibDfUU0vLDYlVJyJmJHJWgYvgT5TCw6Sgyzo2YjRAmzBSF/zkTsRw2Fe qzSqs/SwNp+lavLEri+OEinoMsl5MD1pIs7xovE6Zd51qhvbUNZ+rV3r2owvbozdM83G rH0w== X-Forwarded-Encrypted: i=1; AJvYcCVnFlYeE0n5qmf3W4ElwvVjr6K+IoYi6TwWzYzKZ2xZmiu38AniVIuv1idiUJForRpQpO4uE0/GI4Jgv4Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxTglkSJnknrCF8Dv3SwG7jGx+lVlo3IJHicW7+6uceMWBdFOI2 RTblRwZlk7m5vU9pVjyorYs5pXoLjOXJ2CmWcAt5EOGOrMnE7AQYlfPj X-Gm-Gg: ATEYQzw3favjhSZlJpcFgbMTL93IGRIlGtw0EHXGpvDQIF8hHmq7A8yfDFhdeL3ALjm 5mghgxWFRzcdSzVUMD/+SEEzhplkb4LcL+aE3/BFVpWH8Qx41tuyuTMuzuGX2/DS16wyRTVCved 5jcTRG4rK1NPi8Yn2twobze+sKFVefdSNcaYVf+a7bH2V8xVKk2HJzSKP5jkOO7U8CMr8/kpp7C DAivTi6XTVu5Q+YCQxp4z2qPyv9H+CNA8pgLSQHP8fAXjbInooeFB6E14dBQyenQPvtVLh5cpjH yExGSHHiRMB62UJMg4RnsOt4D3HuUUSBiQzEKuMnhpXJmlwApDXX2KOUWsdrk3GflhXqtl6MPIg j0JxR6S/qWQUVE5PnzMU2fHADzo23VwrQFZ8poYk5kqTSZwvmn44u0a+xtgDDMCGoJR9IjREf9R rGA9egsVkTnOx7qqPfCmwHeqUs9w== X-Received: by 2002:a17:906:3e49:b0:b97:5aa2:8337 with SMTP id a640c23a62f3a-b976514e2afmr618393266b.25.1773681598063; Mon, 16 Mar 2026 10:19:58 -0700 (PDT) Received: from [192.168.0.39] ([79.133.247.80]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b97846174cfsm505940266b.22.2026.03.16.10.19.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 10:19:57 -0700 (PDT) From: Erikas Bitovtas Date: Mon, 16 Mar 2026 19:19:50 +0200 Subject: [PATCH v4 6/7] 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: <20260316-vcnl4000-regulators-v4-6-854fc2eaf54b@gmail.com> References: <20260316-vcnl4000-regulators-v4-0-854fc2eaf54b@gmail.com> In-Reply-To: <20260316-vcnl4000-regulators-v4-0-854fc2eaf54b@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 | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index 76aee16d479b..0a4d82679cfe 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,12 +2012,10 @@ 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", - &data->near_level)) - data->near_level =3D 0; + device_property_read_u32(dev, "proximity-near-level", &data->near_level); =20 indio_dev->info =3D data->chip_spec->info; indio_dev->channels =3D data->chip_spec->channels; @@ -2029,8 +2025,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 +2033,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 +2047,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 +2055,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