From nobody Sun Jun 14 08:15:03 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 E82BF320A0B for ; Wed, 1 Apr 2026 18:17:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775067427; cv=none; b=AvkBYyl1mro19ouZXtB7dZps+6moYul5M3UWtYS+n9hiiEacrL3JObJEZroF0pGsUI17GBsGRtwTdIyh9OBIqUcRrPZd+uEWpY76NuHBlh71cj1I1UpN0FB/DvW7MFsucNvDacnzRcU1Dhg0LU/4wIx6wAi4e+MxJLj0+E70TA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775067427; c=relaxed/simple; bh=IX+wQq4T5DKVzSw6Vp9g1t+wnTvP/wCU3zamd2onuXY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=oS91fT+pGBQdj13P7CydMHtIVabSGu3O+SeD7OX4QY4nXQIHwS0Jsv5W9QkaTzNS+Tzm1t0zaIeoTnTBQg9P9lFUJ+gxLXERF6Tzs4vIogHRScVmnRSTBT3s/M1oFpNr/U72kKxs4yADEI3iKlD1GD9x4oFlF8QLZBuNyhfuf0g= 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=UQlFlopo; arc=none smtp.client-ip=209.85.210.173 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="UQlFlopo" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-82cf976ecacso26299b3a.1 for ; Wed, 01 Apr 2026 11:17:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775067425; x=1775672225; 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=21SX5y/GcmnmuEOgAc+fgSaPS9NksSYjs5veJdbCAfg=; b=UQlFlopoYf9iq6JOJmdq3vSKShpgIsWgWAx8ZCN9Jc64x0pH+XWyx3vgr5mCbk8dG+ FQV41iaVh7sbbEpGCvtgnLn9GdLS5YbZsGQPH/oJyVdyEkVI7fqmSpJhjHvVk9EFdbPF 3/atNzhM/SsYQWYZgcTfd/Z8vUQbYqWjp2fHvv+IvbMF5chK3SagTwZGbWGS+aS0zMNv xKsd5CediUKkd9QjyZhdxpFnpYYf8AYhARuQLf4K60asj91wN3/0ug/jkoqtG3wxv1/i EV+ctMLfyGJ0Fn+sNW0QNvS56P2shSSkrFAEomXa4Cal7IRY0jBSVI65+3irAIE5DLXP s5kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775067425; x=1775672225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=21SX5y/GcmnmuEOgAc+fgSaPS9NksSYjs5veJdbCAfg=; b=C6KVNALD/YqkV/PNHaCdMFJUCB3AWfXbb9Ogcd4xUK8FX+X84W9cM5zY57q+cTsj/2 D+9wKYY/gRBqB1kiJq3CJYZbOFYKa+IRwvz5QBH4JisVe5QMAQrhnkY35hrCbCckQW2x j5hZ3sElw/ufuQszW+Yqj4YOwYvD4MqD/1EBz6yF4DqFGWCSFjaI9khD9remQPZZSqf+ wFGn+C+nEIq39ANVqNbDzHRPtsjP9VHo1szctlEs9I61RsPokVp+GZeItehwP3GMklFY ea/dECC9JOXu8Wa83KZI1eWXbd4V3DdS0/alf8v2qUUbY1Iyl3K4oPPPAnW/fmWHXZ1J 4Y8w== X-Forwarded-Encrypted: i=1; AJvYcCWPHSQTNdY/J9UrzYtC4nBS2nvWTRJeUhcw2j5Pm27SXqZoLmtzSG3axSM1VswtV0EPXiw5THvpCYsh4Mk=@vger.kernel.org X-Gm-Message-State: AOJu0YxZdbpCATcLGD342f4FMttkqt1vYHbo8Cq/0oaM8SqV/m9wX/ul sOT/KjKHPWjyNStqWxMiBVqoQNXwz0dasoFVnCMwMT3nUZ4JwrEx/O/O X-Gm-Gg: ATEYQzyjzAry652KdDRVd/NxnWKlW9MKhYky+XEY1JI4Dk3jimrYTEle/o55PoCmMbe +CgstFngSUehXGLlqnWyufjq1HL4Ui5vqmEoCxfMp81dyjiJigHWj+2itdbnOAWHSTGohMkRIb0 z8h37yeXhzigIMOfcIwbcC2B8Mg58uORd5UtQXtFf+H0GZXZdy4zAOftQJg/5cNd/unfwh/KASz 2++XMt1KB+6hxeh4j0U1J5b+MD588F6NYo9Ic7SY8TrHA1lh0YI08UW9bTOiaEBjw4rk3ZXbUGz UBxEQifPW/hL4CP8VnogOtvMaEV15yuTFtXXsj3m9vGuvDloHweXZoy/jP16bzDEtsW3RybucQZ ZGA+NUIEK8hT0yldlocOdPWDuqi4JjEUeJBNXBTpx2hhqEPiZV4oiVUjAyHAB2a2JTyaOj6Ll2R Mj0dfFdlHoKsCeXGS2gc2wOvGFqvydOsq2ERO1I1PTGewHbVN7 X-Received: by 2002:a05:6a00:a0f:b0:829:8041:83f with SMTP id d2e1a72fcca58-82ce88d4c86mr4873022b3a.7.1775067425265; Wed, 01 Apr 2026 11:17:05 -0700 (PDT) Received: from hu-ckantibh-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9ca14b3sm666249b3a.54.2026.04.01.11.17.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 11:17:04 -0700 (PDT) From: Sanjay Chitroda X-Google-Original-From: Sanjay Chitroda To: hansg@kernel.org, sakari.ailus@linux.intel.com, mchehab@kernel.org Cc: hverkuil+cisco@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] media: i2c: gc0310: fix probe error handling and unwind resources properly Date: Wed, 1 Apr 2026 23:46:55 +0530 Message-Id: <20260401181657.654055-2-sanjayembedded@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260401181657.654055-1-sanjayembedded@gmail.com> References: <20260401181657.654055-1-sanjayembedded@gmail.com> 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 From: Sanjay Chitroda The GC0310 probe path currently performs error cleanup by jumping to a common label that mirrors the driver's remove() callback. This is unsafe, as remove() assumes that the subdevice has been fully registered with the V4L2 framework, media and control resources have been initialized. Calling remove() from probe can result in unregistering or cleaning up subdevice, leading to resource leaks and subtle lifecycle bugs. Rewrite the probe() error handling to unwind resources explicitly, using fine=E2=80=91grained goto labels along with appropriate error logs. Each fa= ilure path now frees only successfully acquired resource, without remove(). This aligns the driver with standard V4L2 sensor lifecycle expectations and avoids incorrect teardown during probe failures. Fixes: 1e72afb5146a ("media: Move gc0310 sensor drivers to drivers/media/i2= c/") Signed-off-by: Sanjay Chitroda --- drivers/media/i2c/gc0310.c | 39 ++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/drivers/media/i2c/gc0310.c b/drivers/media/i2c/gc0310.c index 7af4d66f42a0..72a82ad4118a 100644 --- a/drivers/media/i2c/gc0310.c +++ b/drivers/media/i2c/gc0310.c @@ -721,7 +721,7 @@ static int gc0310_probe(struct i2c_client *client) =20 ret =3D gc0310_detect(sensor); if (ret) - goto err_power_down; + goto error_power_off; =20 sensor->sd.internal_ops =3D &gc0310_internal_ops; sensor->sd.flags |=3D V4L2_SUBDEV_FL_HAS_DEVNODE; @@ -730,20 +730,27 @@ static int gc0310_probe(struct i2c_client *client) =20 ret =3D gc0310_init_controls(sensor); if (ret) - goto err_power_down; + goto error_power_off; =20 ret =3D media_entity_pads_init(&sensor->sd.entity, 1, &sensor->pad); - if (ret) - goto err_power_down; + if (ret) { + dev_err_probe(&client->dev, ret, "failed to init entity pads\n"); + goto error_handler_free; + } =20 sensor->sd.state_lock =3D sensor->ctrls.handler.lock; ret =3D v4l2_subdev_init_finalize(&sensor->sd); - if (ret) - goto err_power_down; + if (ret) { + dev_err_probe(&client->dev, ret, "subdev init error\n"); + goto error_media_entity; + } =20 ret =3D v4l2_async_register_subdev_sensor(&sensor->sd); - if (ret) - goto err_power_down; + if (ret) { + dev_err_probe(&client->dev, ret, + "failed to register gc0310 sub-device\n"); + goto error_subdev_cleanup; + } =20 pm_runtime_set_autosuspend_delay(&client->dev, 1000); pm_runtime_use_autosuspend(&client->dev); @@ -751,9 +758,21 @@ static int gc0310_probe(struct i2c_client *client) =20 return 0; =20 -err_power_down: +error_subdev_cleanup: + v4l2_subdev_cleanup(&sensor->sd); + pm_runtime_disable(&client->dev); + pm_runtime_set_suspended(&client->dev); + +error_media_entity: + media_entity_cleanup(&sensor->sd.entity); + +error_handler_free: + v4l2_ctrl_handler_free(&sensor->ctrls.handler); + +error_power_off: pm_runtime_put_noidle(&client->dev); - gc0310_remove(client); + gc0310_power_off(&client->dev); + return ret; } =20 --=20 2.34.1 From nobody Sun Jun 14 08:15:03 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 AD44F31F9BC for ; Wed, 1 Apr 2026 18:17:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775067430; cv=none; b=eiKYR4w0ZRpoLbRzMicaTbmtED2tfrLpNLn8NN/DATey+XhBRemoF3V5HiwBhHidA6TQjGa0eHo+Bzvoe9+tilI6SQJPrxM35vMAwI+BzQfnia2OBQrGUFyX9AJA1jScbMj4g9wfVaKMaxvvXofibdhV5Qa3Y+vIMa6lB5ZL7pE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775067430; c=relaxed/simple; bh=N/EZlwfTVAXMZYR5+Cbo+7F19oN0R7nVr7sjA/fVH28=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NXMwaaRovapXj0cCFHC6f/hDcHzy3nSf3U7C7LQudh1JNE6Qjq+siT9GfjKCp5yleFoGjgs80m5YI4EVLX7OQS/G85rD5eJukPcIqwqn+aho5OiHM5l0ExH1dMfk5MHjfsdCCuG+Kp7lUJ7NMa1mvXi9xR/0i0or9Ny+IYISwrg= 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=c02290qF; arc=none smtp.client-ip=209.85.210.182 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="c02290qF" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-82cf636dac8so24828b3a.3 for ; Wed, 01 Apr 2026 11:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775067428; x=1775672228; 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=BAnrp5sLZFK9z49ZYni0sXiNyaOFM3jLPCzXU4u6bHg=; b=c02290qFo91/X4aXoah+xoOTxcIxGx+cDuMxt3bIziQJsG7I14rFSa3Qsw+8jXKx68 k3sKmVhIgyRDxBTWKWTQ+IAt7aIlbwtAn5qWMSZIQgQMdu+yfeTbWvcIue6GKcYN9tzJ E48XnCb8z/xMHnhe078UNsP0rUfvVsJZYTyBp5geLAgFN5eGKmk3Ei2mA+fekSNempUf TS83xp43Jo0UfOozn18hDGNFlUspC9gqTVXB85ZVdQoz++AJ8N3j5Wsu3sSNmgVmix47 RZl3X5dSLcyRC1WIJRI4jfZCoH+X9vRlbuMm2f0RW6ejvQSOKWGIxXmWyQKe2icVGizd 0kfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775067428; x=1775672228; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=BAnrp5sLZFK9z49ZYni0sXiNyaOFM3jLPCzXU4u6bHg=; b=NisUFr1sK45Kl7Gw3TP1wd3oGzbX5AAhYuyzFRccmu8nbaEErrXwTuM4Gdur8sgR53 IOnMi1AtUPY3Fs9Lm/C24hWO1HsmFd6wPCqSPAj6HSv0D7l5Xqqku+jynNwYj46y5EPR YH1NgomcuFTuqbPXamqEOXIhZVs0eKl6RwMoyf1LmzaYNgTUG2fawJhTidW/JE4vJUVh ib1b3cYEQZfDKtEISoBY2T1jv3EhckpzfHmA16gN2/XAfgpZr4xpWmGEqa/iQNtpd9S0 VUDdWSIMI/cQPmZydm9L7jUxEAqHGcgR1rZ22WF1quP8uBSdtfzuT/rkhKUzWq5kUkSF Dj1A== X-Forwarded-Encrypted: i=1; AJvYcCUNc+SjNKi3TrJyh6MLsR+Eb6F7h9MG/PgWgYKyuvUPtDaq+uRIYRj8vhhEPKZpWypELqG+SC0XOSufT4M=@vger.kernel.org X-Gm-Message-State: AOJu0Ywao6t47lC7nlcMRNaTR4D1O1Yw8PAFq8Cc+4m7VV1pD7muVXHW J4vTzBoLwQD5CNmAp2KoMBlptxwwEKvUWLed8qdnMeFbymbYrs0z95pw X-Gm-Gg: ATEYQzwy60vZtJdKvMz3bLHGKjYOC70TN5DYi6B6R7VKFQsNGV7X/qlie6yCclF43K/ dtT26tDqDyzBDJUyJjDYt1x7aCkfKDzJftD1omVV8ZVp1ddHpg5qkEgZSsHF+5t1G2zLXcGLyZQ jwoF7wgVPcvDtbrGF0ca6hyVpUGLHO751h0yPnOaJ6vgVILKl6LUyWyB3Dmem8oPS2rgb1XdFFR AiEbHkjR6hfzZXCWxL9+ky6IHNuz8VwjzisbCrWm6qtwL7jTo6J1MBqgyjVjJyIUi848MbVCEcP 4dVR5TfIzhFhzjmN5w/F17iQ58ZEfoJ36adRrCffEO11dKszQXv1hAhFuof0JVDaEitJhl7+nYh rXscxzNFjoO8Lo2T31VBYugVMQ3rJ3nxaWT/QL0YdRZoXLSwtxzO+4lemS+FR3OAg11rBRe3M4V rVtHMdMlz7jHmlUhClUks30MtgOi//uk7SGx7nXbikrDDi6JhQ X-Received: by 2002:a05:6a00:2395:b0:82c:a048:30da with SMTP id d2e1a72fcca58-82ce88ea317mr4687167b3a.8.1775067428037; Wed, 01 Apr 2026 11:17:08 -0700 (PDT) Received: from hu-ckantibh-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9ca14b3sm666249b3a.54.2026.04.01.11.17.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 11:17:07 -0700 (PDT) From: Sanjay Chitroda X-Google-Original-From: Sanjay Chitroda To: hansg@kernel.org, sakari.ailus@linux.intel.com, mchehab@kernel.org Cc: hverkuil+cisco@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] media: i2c: gc0310: use cached client and device pointers Date: Wed, 1 Apr 2026 23:46:56 +0530 Message-Id: <20260401181657.654055-3-sanjayembedded@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260401181657.654055-1-sanjayembedded@gmail.com> References: <20260401181657.654055-1-sanjayembedded@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Sanjay Chitroda The driver was repeatedly retrieving the i2c_client using v4l2_get_subdevdata() only to access the underlying struct device. Replace this with the cached sensor->client and sensor->dev pointers, which are already available in the sensor structure. This simplifies the code, avoids redundant subdev lookups, and makes the driver more consistent with common V4L2 sensor driver patterns. No functional change intended. Signed-off-by: Sanjay Chitroda --- drivers/media/i2c/gc0310.c | 72 ++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/drivers/media/i2c/gc0310.c b/drivers/media/i2c/gc0310.c index 72a82ad4118a..e538479fee2e 100644 --- a/drivers/media/i2c/gc0310.c +++ b/drivers/media/i2c/gc0310.c @@ -84,6 +84,9 @@ #define to_gc0310_sensor(x) container_of(x, struct gc0310_device, sd) =20 struct gc0310_device { + struct device *dev; + struct i2c_client *client; + struct v4l2_subdev sd; struct media_pad pad; =20 @@ -409,28 +412,27 @@ static int gc0310_power_on(struct device *dev) =20 static int gc0310_detect(struct gc0310_device *sensor) { - struct i2c_client *client =3D v4l2_get_subdevdata(&sensor->sd); u64 val; int ret; =20 - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) + if (!i2c_check_functionality(sensor->client->adapter, I2C_FUNC_I2C)) return -ENODEV; =20 ret =3D cci_read(sensor->regmap, GC0310_SC_CMMN_CHIP_ID_REG, &val, NULL); if (ret < 0) { - dev_err(&client->dev, "read sensor_id failed: %d\n", ret); + dev_err(sensor->dev, "read sensor_id failed: %d\n", ret); return -ENODEV; } =20 - dev_dbg(&client->dev, "sensor ID =3D 0x%llx\n", val); + dev_dbg(sensor->dev, "sensor ID =3D 0x%llx\n", val); =20 if (val !=3D GC0310_ID) { - dev_err(&client->dev, "sensor ID error, read id =3D 0x%llx, target id = =3D 0x%x\n", + dev_err(sensor->dev, "sensor ID error, read id =3D 0x%llx, target id =3D= 0x%x\n", val, GC0310_ID); return -ENODEV; } =20 - dev_dbg(&client->dev, "detect gc0310 success\n"); + dev_dbg(sensor->dev, "detect gc0310 success\n"); =20 return 0; } @@ -440,10 +442,9 @@ static int gc0310_enable_streams(struct v4l2_subdev *s= d, u32 pad, u64 streams_mask) { struct gc0310_device *sensor =3D to_gc0310_sensor(sd); - struct i2c_client *client =3D v4l2_get_subdevdata(sd); int ret; =20 - ret =3D pm_runtime_resume_and_get(&client->dev); + ret =3D pm_runtime_resume_and_get(sensor->dev); if (ret) return ret; =20 @@ -474,7 +475,7 @@ static int gc0310_enable_streams(struct v4l2_subdev *sd, =20 error_power_down: if (ret) - pm_runtime_put(&client->dev); + pm_runtime_put(sensor->dev); =20 return ret; } @@ -484,7 +485,6 @@ static int gc0310_disable_streams(struct v4l2_subdev *s= d, u32 pad, u64 streams_mask) { struct gc0310_device *sensor =3D to_gc0310_sensor(sd); - struct i2c_client *client =3D v4l2_get_subdevdata(sd); int ret =3D 0; =20 cci_write(sensor->regmap, GC0310_RESET_RELATED_REG, @@ -494,7 +494,7 @@ static int gc0310_disable_streams(struct v4l2_subdev *s= d, cci_write(sensor->regmap, GC0310_RESET_RELATED_REG, GC0310_REGISTER_PAGE_0, &ret); =20 - pm_runtime_put(&client->dev); + pm_runtime_put(sensor->dev); return ret; } =20 @@ -559,7 +559,6 @@ static const struct v4l2_subdev_internal_ops gc0310_int= ernal_ops =3D { =20 static int gc0310_init_controls(struct gc0310_device *sensor) { - struct i2c_client *client =3D v4l2_get_subdevdata(&sensor->sd); struct v4l2_ctrl_handler *hdl =3D &sensor->ctrls.handler; struct v4l2_fwnode_device_properties props; int exp_max, ret; @@ -597,7 +596,7 @@ static int gc0310_init_controls(struct gc0310_device *s= ensor) GC0310_H_BLANK_DEFAULT, 1, GC0310_H_BLANK_DEFAULT); =20 - ret =3D v4l2_fwnode_device_parse(&client->dev, &props); + ret =3D v4l2_fwnode_device_parse(sensor->dev, &props); if (ret) return ret; =20 @@ -621,10 +620,10 @@ static void gc0310_remove(struct i2c_client *client) v4l2_subdev_cleanup(sd); media_entity_cleanup(&sensor->sd.entity); v4l2_ctrl_handler_free(&sensor->ctrls.handler); - pm_runtime_disable(&client->dev); - if (!pm_runtime_status_suspended(&client->dev)) { - gc0310_power_off(&client->dev); - pm_runtime_set_suspended(&client->dev); + pm_runtime_disable(sensor->dev); + if (!pm_runtime_status_suspended(sensor->dev)) { + gc0310_power_off(sensor->dev); + pm_runtime_set_suspended(sensor->dev); } } =20 @@ -695,15 +694,18 @@ static int gc0310_probe(struct i2c_client *client) if (!sensor) return -ENOMEM; =20 - sensor->reset =3D devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_HIGH); + sensor->client =3D client; + sensor->dev =3D &client->dev; + + sensor->reset =3D devm_gpiod_get(sensor->dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(sensor->reset)) { - return dev_err_probe(&client->dev, PTR_ERR(sensor->reset), + return dev_err_probe(sensor->dev, PTR_ERR(sensor->reset), "getting reset GPIO\n"); } =20 - sensor->powerdown =3D devm_gpiod_get(&client->dev, "powerdown", GPIOD_OUT= _HIGH); + sensor->powerdown =3D devm_gpiod_get(sensor->dev, "powerdown", GPIOD_OUT_= HIGH); if (IS_ERR(sensor->powerdown)) { - return dev_err_probe(&client->dev, PTR_ERR(sensor->powerdown), + return dev_err_probe(sensor->dev, PTR_ERR(sensor->powerdown), "getting powerdown GPIO\n"); } =20 @@ -713,11 +715,11 @@ static int gc0310_probe(struct i2c_client *client) if (IS_ERR(sensor->regmap)) return PTR_ERR(sensor->regmap); =20 - gc0310_power_on(&client->dev); + gc0310_power_on(sensor->dev); =20 - pm_runtime_set_active(&client->dev); - pm_runtime_get_noresume(&client->dev); - pm_runtime_enable(&client->dev); + pm_runtime_set_active(sensor->dev); + pm_runtime_get_noresume(sensor->dev); + pm_runtime_enable(sensor->dev); =20 ret =3D gc0310_detect(sensor); if (ret) @@ -734,34 +736,34 @@ static int gc0310_probe(struct i2c_client *client) =20 ret =3D media_entity_pads_init(&sensor->sd.entity, 1, &sensor->pad); if (ret) { - dev_err_probe(&client->dev, ret, "failed to init entity pads\n"); + dev_err_probe(sensor->dev, ret, "failed to init entity pads\n"); goto error_handler_free; } =20 sensor->sd.state_lock =3D sensor->ctrls.handler.lock; ret =3D v4l2_subdev_init_finalize(&sensor->sd); if (ret) { - dev_err_probe(&client->dev, ret, "subdev init error\n"); + dev_err_probe(sensor->dev, ret, "subdev init error\n"); goto error_media_entity; } =20 ret =3D v4l2_async_register_subdev_sensor(&sensor->sd); if (ret) { - dev_err_probe(&client->dev, ret, + dev_err_probe(sensor->dev, ret, "failed to register gc0310 sub-device\n"); goto error_subdev_cleanup; } =20 - pm_runtime_set_autosuspend_delay(&client->dev, 1000); - pm_runtime_use_autosuspend(&client->dev); - pm_runtime_put_autosuspend(&client->dev); + pm_runtime_set_autosuspend_delay(sensor->dev, 1000); + pm_runtime_use_autosuspend(sensor->dev); + pm_runtime_put_autosuspend(sensor->dev); =20 return 0; =20 error_subdev_cleanup: v4l2_subdev_cleanup(&sensor->sd); - pm_runtime_disable(&client->dev); - pm_runtime_set_suspended(&client->dev); + pm_runtime_disable(sensor->dev); + pm_runtime_set_suspended(sensor->dev); =20 error_media_entity: media_entity_cleanup(&sensor->sd.entity); @@ -770,8 +772,8 @@ static int gc0310_probe(struct i2c_client *client) v4l2_ctrl_handler_free(&sensor->ctrls.handler); =20 error_power_off: - pm_runtime_put_noidle(&client->dev); - gc0310_power_off(&client->dev); + pm_runtime_put_noidle(sensor->dev); + gc0310_power_off(sensor->dev); =20 return ret; } --=20 2.34.1 From nobody Sun Jun 14 08:15:03 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 9F5E231E85B for ; Wed, 1 Apr 2026 18:17:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775067432; cv=none; b=CvzXGvFyvI/2KsbVKTunxDGrjAINbh0olGpPFXA9QAiKpfXIqLWSw+C2KtcMl5oyC36OW16EerF+/VTR5zPXmpzXk1X7/qlGOSDMkkunJwgxkodiJ31Ndny0Yi735SXZoMoJBh6fz/MYwRTmxR22UrT65fmyfPDNDp5AFW5DXnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775067432; c=relaxed/simple; bh=ST1x8Uz6TQiGe79USzqdmWvtwG5sB+Qa3OSNFjV2atk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=T2Luf5En+SB7dQHhXuibyBc+TrH1zVLfprPVDdJTZoOLqEkp1hFa5DeDRtnTzl9r83/cXnyB4/uJnP/Ttt4sNKLN60o04XNHrIhRBisSJOGkH51hTZZYTaDoToXpkvMYC937tQkcWlGRjQWe3PqFcjvpbDHla+g7XPkJzFymKMU= 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=CkKbYpvr; arc=none smtp.client-ip=209.85.210.177 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="CkKbYpvr" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-82ce09b61beso35552b3a.0 for ; Wed, 01 Apr 2026 11:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775067431; x=1775672231; 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=s4DmGGsmlsWiS4YmUq0GXU6tJWK3BV4/TprF0P8CHx8=; b=CkKbYpvraMDRHRyVBuECfsavtGsmm1Ts+W3gAvE++KnUMCN7ehZ7STgv6X2yyiUGED CYKfoRQpHIy0q/z42ucQj9zXjeYu4w0/hufKnCwmnUEi2GBnILBTUX89nfPQZEaB+Toj Hbh6+89IPoDrjkY6DZA5T9S/o775KU35r325M9rqexyutu/K2LJs9glOH+pdPj29yFe3 qG3UY2/D5/nCTLK3gKBO33Fn5smHOgv7RB1I2auzMH+xD2FVIGaPMqj0kK/Gr1wvDDIV o9tdeF21rMW3ji2I0YFrsAxw7mmu57a7uZyMOiRErh7cgeyL4x8l2Ihh1Yss4f1zIpGW woHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775067431; x=1775672231; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=s4DmGGsmlsWiS4YmUq0GXU6tJWK3BV4/TprF0P8CHx8=; b=ZgLEPbahpmqGkH5P+0hoN8BwFmCyZHpb4wMag3Q5rnQX2HUIGLERglGnuzE+ZtTLjf SO31R+rjM7vF6p9mGr+RTeJm09l9aZKEwLBocrh5Ql4xQZnN7Wj3IF0hECE9PtUMXluD AYlO8QNp1scTpGRTePsdCJX4USKq1xRLif+DxjHnDL4Sj3YxBw2puwyDm5Ak1knqX5v5 suNR/dEPYFGeUbvyUnHzESqUfsdehPTMN+n9mDj3A3mM1eRJc+JHWhAOdCrD5AQmWrtx v/26VxQ+BDEg4FD+DbBfz79zYeFxeSaXtddesmoIRU/LqnEMTt858dffUs343WLoekP/ P+sw== X-Forwarded-Encrypted: i=1; AJvYcCXLj7S6joQNlrPJTiUg89+5fW3ExKKVOlhddplss4I7A+ZAovi2JaEZ9N8IJuQ5vBS2X4g1ebXA1bJP2vg=@vger.kernel.org X-Gm-Message-State: AOJu0YyyE/GWHtyrW25YbMSefgBTKZunaLLvG8wwhx8c22fSO/5m2U/x C2DtcrYG+6os7HGtt0LknnrBVCTTlU/RUI1yytRLooLmyjiHICQIKp1GUkjL/A== X-Gm-Gg: ATEYQzz1rhW7oMqKUOOEe9kXI3/l8q0tDQlni2a909cofY3QzcOs184p/7iwnBfw6Br +8d6uctSvnYpLQwu6UQnlhqLldvZUmWE2N1kuWa2c1k6DB43nPmN8SaxewL0vtLCeOS5coo+R4b H5Ys6o4IAWXEMDLbc18MqnRDH80uhsxDq/7bCVJNkZutavv165tgxeBUeFgPxqI2TkBkv2RiYec AuhpBY1OZAKT48g+CHRhrHvRM/3ZEx28A5+GdXXDGvbK7zSI/zzREPCMALPn1U6A3lxe7GptS+c sPOwLr5ZXhYorpv/M5HC32nzAiGWHso6ZMFxZIcB8fd1/K3oO/s+Yw2AsDqH8slyTeeuBt0iLzV csAsuVuwV2FNbjX5xfxTAxQwMhZCMvdRHsWvWCzIpoMtyZ5TEm+eFWeonhhRYdndVfJpMic9i6E Tp5DSH/ve1hdLDmc5h1NGQJDZ+onJQBP+RCLoJNuLX4I8JRife X-Received: by 2002:a05:6a00:6717:b0:82c:f035:6748 with SMTP id d2e1a72fcca58-82cf03569afmr2319067b3a.42.1775067430834; Wed, 01 Apr 2026 11:17:10 -0700 (PDT) Received: from hu-ckantibh-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9ca14b3sm666249b3a.54.2026.04.01.11.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 11:17:10 -0700 (PDT) From: Sanjay Chitroda X-Google-Original-From: Sanjay Chitroda To: hansg@kernel.org, sakari.ailus@linux.intel.com, mchehab@kernel.org Cc: hverkuil+cisco@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] media: i2c: gc0310: Use devm_v4l2_sensor_clk_get() Date: Wed, 1 Apr 2026 23:46:57 +0530 Message-Id: <20260401181657.654055-4-sanjayembedded@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260401181657.654055-1-sanjayembedded@gmail.com> References: <20260401181657.654055-1-sanjayembedded@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Sanjay Chitroda Several camera sensor drivers access the "clock-frequency" property directly to retrieve the external clock rate or handle the external clock manually in the driver. While this is valid on a subset of ACPI platforms, implementing this logic directly in drivers is deprecated and can lead to inconsistent behaviour across drivers. This driver supports ACPI platforms only. It currently retrieves the external clock rate from the "clock-frequency" property and fails probing if the rate does not match the expected value, which is the correct policy for ACPI platforms. Switch to using the devm_v4l2_sensor_clk_get() helper to standardise clock handling. This preserves the existing behaviour on ACPI platforms that specify a clock-frequency property without providing a clock. On platforms that provide a clock, the helper will program the clock to the rate specified by clock-frequency, which is also consistent with the driver's expectations. Signed-off-by: Sanjay Chitroda Reviewed-by: Hans de Goede --- drivers/media/i2c/gc0310.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/media/i2c/gc0310.c b/drivers/media/i2c/gc0310.c index e538479fee2e..e9e67bd73f51 100644 --- a/drivers/media/i2c/gc0310.c +++ b/drivers/media/i2c/gc0310.c @@ -6,6 +6,7 @@ * Copyright (c) 2023-2025 Hans de Goede */ =20 +#include #include #include #include @@ -84,6 +85,7 @@ #define to_gc0310_sensor(x) container_of(x, struct gc0310_device, sd) =20 struct gc0310_device { + struct clk *clk; struct device *dev; struct i2c_client *client; =20 @@ -634,7 +636,6 @@ static int gc0310_check_hwcfg(struct device *dev) }; struct fwnode_handle *ep_fwnode; unsigned long link_freq_bitmap; - u32 mclk; int ret; =20 /* @@ -646,21 +647,6 @@ static int gc0310_check_hwcfg(struct device *dev) return dev_err_probe(dev, -EPROBE_DEFER, "waiting for fwnode graph endpoint\n"); =20 - ret =3D fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency", - &mclk); - if (ret) { - fwnode_handle_put(ep_fwnode); - return dev_err_probe(dev, ret, - "reading clock-frequency property\n"); - } - - if (mclk !=3D GC0310_MCLK_FREQ) { - fwnode_handle_put(ep_fwnode); - return dev_err_probe(dev, -EINVAL, - "external clock %u is not supported\n", - mclk); - } - ret =3D v4l2_fwnode_endpoint_alloc_parse(ep_fwnode, &bus_cfg); fwnode_handle_put(ep_fwnode); if (ret) @@ -684,6 +670,7 @@ static int gc0310_check_hwcfg(struct device *dev) static int gc0310_probe(struct i2c_client *client) { struct gc0310_device *sensor; + unsigned long freq; int ret; =20 ret =3D gc0310_check_hwcfg(&client->dev); @@ -697,6 +684,16 @@ static int gc0310_probe(struct i2c_client *client) sensor->client =3D client; sensor->dev =3D &client->dev; =20 + sensor->clk =3D devm_v4l2_sensor_clk_get(sensor->dev, NULL); + if (IS_ERR(sensor->clk)) + return dev_err_probe(sensor->dev, PTR_ERR(sensor->clk), + "failed to get clock\n"); + + freq =3D clk_get_rate(sensor->clk); + if (freq !=3D GC0310_MCLK_FREQ) + return dev_err_probe(sensor->dev, -EINVAL, + "external clock %lu is not supported\n", freq); + sensor->reset =3D devm_gpiod_get(sensor->dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(sensor->reset)) { return dev_err_probe(sensor->dev, PTR_ERR(sensor->reset), --=20 2.34.1