From patchwork Thu Feb 29 16:53:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 13577412 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 EECA770AF7; Thu, 29 Feb 2024 16:53:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709225637; cv=none; b=k43Ync50szrFf6UVJLuug+4woqPwPK42JbfbrejiBOMbLG3ZwNGAbPHGA+iXZq6p2LD/CvPfzDzaow4Vp8zTJymHSnoSEsNzbRkmUcCT4oNl27Gs6iaRG1grORrBxB4QszOw72UAy5LYit2wOag99heT5A0SzrIyaHjTK8uMfwE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709225637; c=relaxed/simple; bh=etDRRTr/CNjroes7TicKi1vHkjrEQdFYU6BMYUsvrM4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vEpET/aN0E0ZEPUGofcROFrK2r+im9EXY3FXvlIxZJoSAkubBQZ5o5+hVbHc6wgJJZWtkpC+2S5yBDjMeksvw6/jBMz8Y1Ggrsa67+1sjyVQItkxQ8QqZi6T/pis50g+OvSSh3z5/yv20+itWud+LjhHjXmmeoUYaTDbnLLg3jk= 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=dJ2rZAvd; arc=none smtp.client-ip=209.85.167.48 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="dJ2rZAvd" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5132b1e66ddso589497e87.3; Thu, 29 Feb 2024 08:53:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709225633; x=1709830433; 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=lHSmb/9WbdODuXMrklIpysrM5LKlzco4ghJo7saWs/4=; b=dJ2rZAvdkXV5AJTkpAG8MVp63ZIFUUzaSASauyvA8ShqXCKmAUA0u6F7h7bxqRqfZt k5vOT8qyHvirEwR5dPsBVBuS0SwSgHRw7SC6ARNkrBY9TnmZ4nT6LHUh6faqbcHHIsmo 2B2XM95sxqKLAFcPDe9zYmR902ebshmC5BdYFNzOFxMFDSIrw4rPmB9HaSGf1i8189K5 7rM/x8mTu0WvPvt0r1BnUGJ+gd/zuVPexqN4gbwqHxksvWx0tl2+11XKGW9nztA6zYDs CTaqgdZMnov3FGdUratQ9Beo/BeqocAexgBGqB/PInf+O6f8L1pM0ukt8o+LizNW/WYB P1kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709225633; x=1709830433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lHSmb/9WbdODuXMrklIpysrM5LKlzco4ghJo7saWs/4=; b=ZgUNSXBZuZK/XWgOsacKuMixbKSKcDKB4LMtiHgt0cfX7eAo2Oehhmm+7KwnYWU4Z+ woLEfw+e13uxe6h4rhJYCMBG/yG0GgczTpAcr8Yi58RSVwSYfO/T7MzsTkw49u0GQ7Sh G7v/wLhpCkNtgOSMU6ds1pj5FpAG8/0x+0KAAANmHGs9jMqReOjy0mH+5SpfToPUMJcH H/HX9n7AY2JXoyUNQKwTQiWDhKA/1LZ6L3VqNqAbwLcbm4tIvldBMEO9dxkStXGFYdCC VGXcp3m/8kjx4KCgAuEJkizLQwZeYYAXTVg0z8S2J37o/lY+IGARSm5khIszf2FWoMdn hgeQ== X-Forwarded-Encrypted: i=1; AJvYcCU3QuW+afFPXlGHXWKanWGlNJHxICn6WE52UgagJPKyaxJcw3I53lAmni92Nspbsj9Hr5uSQMBnMejnivhBAO0GwlLZwcyrnAXIA44s X-Gm-Message-State: AOJu0YxDBQHOeZPW+FE977py86d4Vf3SynaMw7a2VoOHHEBBv7UhZFC0 rkj1XTf5JMzNS/NQ7EYOOwlr5kc1JpaGiANgO/mNSj37ku5U4/Z20k4nZCXCe98= X-Google-Smtp-Source: AGHT+IHBgeRsdeEHYzbFplFYTKMly9Z0UnsyIYhbPbbZIWwwuNV1D9WrGUq7sZYph7CycEMrf3aA4A== X-Received: by 2002:a19:8c4a:0:b0:512:e061:e35d with SMTP id i10-20020a198c4a000000b00512e061e35dmr1898793lfj.53.1709225633562; Thu, 29 Feb 2024 08:53:53 -0800 (PST) Received: from localhost ([83.149.246.185]) by smtp.gmail.com with ESMTPSA id h18-20020ac24db2000000b00513142744d4sm304221lfe.191.2024.02.29.08.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 08:53:52 -0800 (PST) From: Mikhail Rudenko To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sakari Ailus , Laurent Pinchart , Jacopo Mondi , Tommaso Merciai , Christophe JAILLET , Dave Stevenson , Mauro Carvalho Chehab , Mikhail Rudenko Subject: [PATCH v3 05/20] media: i2c: ov4689: Remove i2c_client from ov4689 struct Date: Thu, 29 Feb 2024 19:53:18 +0300 Message-ID: <20240229165333.227484-6-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240229165333.227484-1-mike.rudenko@gmail.com> References: <20240229165333.227484-1-mike.rudenko@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The 'client' field within the 'ov4689' structure is solely used to access its 'dev' member. This commit removes the 'client' field and directly stores a pointer to the 'struct device'. Signed-off-by: Mikhail Rudenko Reviewed-by: Laurent Pinchart --- drivers/media/i2c/ov4689.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index d31659139a6e..56bf1d964e43 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -74,7 +74,7 @@ struct ov4689_mode { }; struct ov4689 { - struct i2c_client *client; + struct device *dev; struct regmap *regmap; struct clk *xvclk; struct gpio_desc *reset_gpio; @@ -405,13 +405,13 @@ static int ov4689_get_selection(struct v4l2_subdev *sd, static int ov4689_s_stream(struct v4l2_subdev *sd, int on) { struct ov4689 *ov4689 = to_ov4689(sd); - struct i2c_client *client = ov4689->client; + struct device *dev = ov4689->dev; int ret = 0; mutex_lock(&ov4689->mutex); if (on) { - ret = pm_runtime_resume_and_get(&client->dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) goto unlock_and_return; @@ -420,26 +420,26 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on) ov4689->cur_mode->num_regs, NULL); if (ret) { - pm_runtime_put(&client->dev); + pm_runtime_put(dev); goto unlock_and_return; } ret = __v4l2_ctrl_handler_setup(&ov4689->ctrl_handler); if (ret) { - pm_runtime_put(&client->dev); + pm_runtime_put(dev); goto unlock_and_return; } ret = cci_write(ov4689->regmap, OV4689_REG_CTRL_MODE, OV4689_MODE_STREAMING, NULL); if (ret) { - pm_runtime_put(&client->dev); + pm_runtime_put(dev); goto unlock_and_return; } } else { cci_write(ov4689->regmap, OV4689_REG_CTRL_MODE, OV4689_MODE_SW_STANDBY, NULL); - pm_runtime_put(&client->dev); + pm_runtime_put(dev); } unlock_and_return: @@ -553,7 +553,6 @@ static const struct v4l2_subdev_ops ov4689_subdev_ops = { */ static int ov4689_map_gain(struct ov4689 *ov4689, int logical_gain, int *result) { - const struct device *dev = &ov4689->client->dev; const struct ov4689_gain_range *range; unsigned int n; @@ -564,7 +563,8 @@ static int ov4689_map_gain(struct ov4689 *ov4689, int logical_gain, int *result) } if (n == ARRAY_SIZE(ov4689_gain_ranges)) { - dev_warn_ratelimited(dev, "no mapping found for gain %d\n", + dev_warn_ratelimited(ov4689->dev, + "no mapping found for gain %d\n", logical_gain); return -EINVAL; } @@ -580,7 +580,7 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) { struct ov4689 *ov4689 = container_of(ctrl->handler, struct ov4689, ctrl_handler); - struct i2c_client *client = ov4689->client; + struct device *dev = ov4689->dev; int sensor_gain; s64 max_expo; int ret; @@ -597,7 +597,7 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) break; } - if (!pm_runtime_get_if_in_use(&client->dev)) + if (!pm_runtime_get_if_in_use(dev)) return 0; switch (ctrl->id) { @@ -618,13 +618,13 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) ret = ov4689_enable_test_pattern(ov4689, ctrl->val); break; default: - dev_warn(&client->dev, "%s Unhandled id:0x%x, val:0x%x\n", + dev_warn(dev, "%s Unhandled id:0x%x, val:0x%x\n", __func__, ctrl->id, ctrl->val); ret = -EINVAL; break; } - pm_runtime_put(&client->dev); + pm_runtime_put(dev); return ret; } @@ -689,8 +689,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) if (handler->error) { ret = handler->error; - dev_err(&ov4689->client->dev, "Failed to init controls(%d)\n", - ret); + dev_err(ov4689->dev, "Failed to init controls(%d)\n", ret); goto err_free_handler; } @@ -716,7 +715,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) static int ov4689_check_sensor_id(struct ov4689 *ov4689, struct i2c_client *client) { - struct device *dev = &ov4689->client->dev; + struct device *dev = ov4689->dev; u64 id = 0; int ret; @@ -744,7 +743,7 @@ static int ov4689_configure_regulators(struct ov4689 *ov4689) for (i = 0; i < ARRAY_SIZE(ov4689_supply_names); i++) ov4689->supplies[i].supply = ov4689_supply_names[i]; - return devm_regulator_bulk_get(&ov4689->client->dev, + return devm_regulator_bulk_get(ov4689->dev, ARRAY_SIZE(ov4689_supply_names), ov4689->supplies); } @@ -813,7 +812,8 @@ static int ov4689_probe(struct i2c_client *client) if (!ov4689) return -ENOMEM; - ov4689->client = client; + ov4689->dev = dev; + ov4689->cur_mode = &supported_modes[OV4689_MODE_2688_1520]; ov4689->xvclk = devm_clk_get_optional(dev, NULL);