From patchwork Mon Sep 21 16:23:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 67196 X-Patchwork-Delegate: sakari.ailus@iki.fi Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1kKOVc-0016RH-GK; Mon, 21 Sep 2020 16:17:45 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728165AbgIUQX4 (ORCPT + 1 other); Mon, 21 Sep 2020 12:23:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:50630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728110AbgIUQX4 (ORCPT ); Mon, 21 Sep 2020 12:23:56 -0400 Received: from localhost.localdomain (unknown [194.230.155.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 76B8A206BE; Mon, 21 Sep 2020 16:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600705435; bh=BWncN5L8Bc4Xtu/OJ3n9FqXOqZMQ9GY5uKsGG0hwNkA=; h=From:To:Cc:Subject:Date:From; b=1Ijx6Wx3fvDAlv4k/DdM/1ziEqJnX311SiwlDFkZ1WQ7fUzSjQFd5l4cB2zv5cMAm SnWxU6ex5j2lVYT/XR12ObDsClZtFgjgCVjOwBMzSNUCBnXWQTS9LCbVs0RUwDsW1y vV7QI1duz99ylhL/oRly3BtAbB7mtuKSduQH53So= From: Krzysztof Kozlowski To: Pavel Machek , Sakari Ailus , Mauro Carvalho Chehab , Lars-Peter Clausen , Tianshu Qiu , Dongchun Zhu , Shawn Tu , Ricardo Ribalda , Dave Stevenson , Manivannan Sadhasivam , Bingbu Cao , Rui Miguel Silva , Shunqian Zheng , Chiranjeevi Rapolu , Hyungwoo Yang , Wenyou Yang , Hans Verkuil , Marco Felsch , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 01/25] media: i2c: imx214: simplify getting state container Date: Mon, 21 Sep 2020 18:23:18 +0200 Message-Id: <20200921162342.7348-1-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -3.1 (---) X-LSpam-Report: No, score=-3.1 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_HIGH=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,DKIM_VALID_EF=-0.1,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no The pointer to 'struct v4l2_subdev' is stored in drvdata via v4l2_i2c_subdev_init() so there is no point of a dance like: struct i2c_client *client = to_i2c_client(struct device *dev) struct v4l2_subdev *sd = i2c_get_clientdata(client); This allows to remove local variable 'client' and few pointer dereferences. White at it, use 'dev' directly instead of 'imx214->dev'. Signed-off-by: Krzysztof Kozlowski --- drivers/media/i2c/imx214.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 1ef5af9a8c8b..dc27c3678f18 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -431,14 +431,13 @@ static inline struct imx214 *to_imx214(struct v4l2_subdev *sd) static int __maybe_unused imx214_power_on(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); - struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct v4l2_subdev *sd = dev_get_drvdata(dev); struct imx214 *imx214 = to_imx214(sd); int ret; ret = regulator_bulk_enable(IMX214_NUM_SUPPLIES, imx214->supplies); if (ret < 0) { - dev_err(imx214->dev, "failed to enable regulators: %d\n", ret); + dev_err(dev, "failed to enable regulators: %d\n", ret); return ret; } @@ -447,7 +446,7 @@ static int __maybe_unused imx214_power_on(struct device *dev) ret = clk_prepare_enable(imx214->xclk); if (ret < 0) { regulator_bulk_disable(IMX214_NUM_SUPPLIES, imx214->supplies); - dev_err(imx214->dev, "clk prepare enable failed\n"); + dev_err(dev, "clk prepare enable failed\n"); return ret; } @@ -459,8 +458,7 @@ static int __maybe_unused imx214_power_on(struct device *dev) static int __maybe_unused imx214_power_off(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); - struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct v4l2_subdev *sd = dev_get_drvdata(dev); struct imx214 *imx214 = to_imx214(sd); gpiod_set_value_cansleep(imx214->enable_gpio, 0); @@ -910,8 +908,7 @@ static int imx214_parse_fwnode(struct device *dev) static int __maybe_unused imx214_suspend(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); - struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct v4l2_subdev *sd = dev_get_drvdata(dev); struct imx214 *imx214 = to_imx214(sd); if (imx214->streaming) @@ -922,8 +919,7 @@ static int __maybe_unused imx214_suspend(struct device *dev) static int __maybe_unused imx214_resume(struct device *dev) { - struct i2c_client *client = to_i2c_client(dev); - struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct v4l2_subdev *sd = dev_get_drvdata(dev); struct imx214 *imx214 = to_imx214(sd); int ret;