{"id":4161,"url":"https://patchwork.libcamera.org/api/1.1/patches/4161/?format=json","web_url":"https://patchwork.libcamera.org/patch/4161/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200623164224.44476-4-jacopo@jmondi.org>","date":"2020-06-23T16:42:23","name":"[libcamera-devel,14/25] media: ov5647: Rationalize driver structure name","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"8eeefacdf8a2777af8385cd06131026ca702daa1","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/4161/mbox/","series":[{"id":1030,"url":"https://patchwork.libcamera.org/api/1.1/series/1030/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1030","date":"2020-06-23T10:07:50","name":"media: ov5647: Support RaspberryPi Camera Module v1","version":1,"mbox":"https://patchwork.libcamera.org/series/1030/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/4161/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/4161/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 18706609A5\n\tfor ;\n\tTue, 23 Jun 2020 18:39:22 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 727E460010;\n\tTue, 23 Jun 2020 16:39:18 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"mchehab@kernel.org, sakari.ailus@linux.intel.com, hverkuil@xs4all.nl,\n\tlaurent.pinchart@ideasonboard.com, roman.kovalivskyi@globallogic.com, \n\tdave.stevenson@raspberrypi.org, naush@raspberrypi.com","Cc":"mrodin@de.adit-jv.com, hugues.fruchet@st.com, mripard@kernel.org,\n\taford173@gmail.com, sudipi@jp.adit-jv.com, andrew_gabbasov@mentor.com,\n\terosca@de.adit-jv.com, linux-media@vger.kernel.org,\n\tlibcamera-devel@lists.libcamera.org, Jacopo Mondi ","Date":"Tue, 23 Jun 2020 18:42:23 +0200","Message-Id":"<20200623164224.44476-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200623100815.10674-1-jacopo@jmondi.org>","References":"<20200623100815.10674-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 14/25] media: ov5647: Rationalize driver\n\tstructure name","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 23 Jun 2020 16:39:22 -0000"},"content":"The driver structure name is referred to with different names ('ov5647',\n'state', 'sensor') in different functions in the driver.\n\nPolish this up by using 'struct ov5647 *sensor' everywhere.\n\nSigned-off-by: Jacopo Mondi \n---\n drivers/media/i2c/ov5647.c | 44 +++++++++++++++++++-------------------\n 1 file changed, 22 insertions(+), 22 deletions(-)","diff":"diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c\nindex 8cfe315cfd00b..03f4f1a257ecd 100644\n--- a/drivers/media/i2c/ov5647.c\n+++ b/drivers/media/i2c/ov5647.c\n@@ -98,7 +98,7 @@ struct ov5647 {\n \tstruct v4l2_ctrl_handler\tctrls;\n };\n \n-static inline struct ov5647 *to_state(struct v4l2_subdev *sd)\n+static inline struct ov5647 *to_sensor(struct v4l2_subdev *sd)\n {\n \treturn container_of(sd, struct ov5647, sd);\n }\n@@ -310,7 +310,7 @@ static int ov5647_set_mode(struct v4l2_subdev *sd)\n static int ov5647_stream_on(struct v4l2_subdev *sd)\n {\n \tstruct i2c_client *client = v4l2_get_subdevdata(sd);\n-\tstruct ov5647 *ov5647 = to_state(sd);\n+\tstruct ov5647 *sensor = to_sensor(sd);\n \tu8 val = MIPI_CTRL00_BUS_IDLE;\n \tint ret;\n \n@@ -325,7 +325,7 @@ static int ov5647_stream_on(struct v4l2_subdev *sd)\n \tif (ret)\n \t\treturn ret;\n \n-\tif (ov5647->clock_ncont)\n+\tif (sensor->clock_ncont)\n \t\tval |= MIPI_CTRL00_CLOCK_LANE_GATE |\n \t\t MIPI_CTRL00_LINE_SYNC_ENABLE;\n \n@@ -379,17 +379,17 @@ static int ov5647_sensor_power(struct v4l2_subdev *sd, int on)\n \tstruct ov5647 *ov5647 = to_state(sd);\n \tint ret = 0;\n \n-\tmutex_lock(&ov5647->lock);\n+\tmutex_lock(&sensor->lock);\n \n-\tif (on && !ov5647->power_count)\t{\n+\tif (on && !sensor->power_count)\t{\n \t\tdev_dbg(&client->dev, \"OV5647 power on\\n\");\n \n-\t\tif (ov5647->pwdn) {\n-\t\t\tgpiod_set_value_cansleep(ov5647->pwdn, 0);\n+\t\tif (sensor->pwdn) {\n+\t\t\tgpiod_set_value_cansleep(sensor->pwdn, 0);\n \t\t\tmsleep(PWDN_ACTIVE_DELAY_MS);\n \t\t}\n \n-\t\tret = clk_prepare_enable(ov5647->xclk);\n+\t\tret = clk_prepare_enable(sensor->xclk);\n \t\tif (ret < 0) {\n \t\t\tdev_err(&client->dev, \"clk prepare enable failed\\n\");\n \t\t\tgoto out;\n@@ -398,7 +398,7 @@ static int ov5647_sensor_power(struct v4l2_subdev *sd, int on)\n \t\tret = ov5647_write_array(sd, sensor_oe_enable_regs,\n \t\t\t\t\t ARRAY_SIZE(sensor_oe_enable_regs));\n \t\tif (ret < 0) {\n-\t\t\tclk_disable_unprepare(ov5647->xclk);\n+\t\t\tclk_disable_unprepare(sensor->xclk);\n \t\t\tdev_err(&client->dev,\n \t\t\t\t\"write sensor_oe_enable_regs error\\n\");\n \t\t\tgoto out;\n@@ -407,12 +407,12 @@ static int ov5647_sensor_power(struct v4l2_subdev *sd, int on)\n \t\t/* Stream off to coax lanes into LP-11 state. */\n \t\tret = ov5647_stream_off(sd);\n \t\tif (ret < 0) {\n-\t\t\tclk_disable_unprepare(ov5647->xclk);\n+\t\t\tclk_disable_unprepare(sensor->xclk);\n \t\t\tdev_err(&client->dev,\n \t\t\t\t\"Camera not available, check Power\\n\");\n \t\t\tgoto out;\n \t\t}\n-\t} else if (!on && ov5647->power_count == 1) {\n+\t} else if (!on && sensor->power_count == 1) {\n \t\tdev_dbg(&client->dev, \"OV5647 power off\\n\");\n \n \t\tret = ov5647_write_array(sd, sensor_oe_disable_regs,\n@@ -424,16 +424,16 @@ static int ov5647_sensor_power(struct v4l2_subdev *sd, int on)\n \t\tif (ret < 0)\n \t\t\tdev_dbg(&client->dev, \"soft stby failed\\n\");\n \n-\t\tclk_disable_unprepare(ov5647->xclk);\n-\t\tgpiod_set_value_cansleep(ov5647->pwdn, 1);\n+\t\tclk_disable_unprepare(sensor->xclk);\n+\t\tgpiod_set_value_cansleep(sensor->pwdn, 1);\n \t}\n \n \t/* Update the power count. */\n-\tov5647->power_count += on ? 1 : -1;\n-\tWARN_ON(ov5647->power_count < 0);\n+\tsensor->power_count += on ? 1 : -1;\n+\tWARN_ON(sensor->power_count < 0);\n \n out:\n-\tmutex_unlock(&ov5647->lock);\n+\tmutex_unlock(&sensor->lock);\n \n \treturn ret;\n }\n@@ -473,7 +473,7 @@ static const struct v4l2_subdev_core_ops ov5647_subdev_core_ops = {\n \n static int ov5647_s_stream(struct v4l2_subdev *sd, int enable)\n {\n-\tstruct ov5647 *sensor = to_state(sd);\n+\tstruct ov5647 *sensor = to_sensor(sd);\n \tint ret;\n \n \tmutex_lock(&sensor->lock);\n@@ -859,13 +859,13 @@ static int ov5647_probe(struct i2c_client *client)\n static int ov5647_remove(struct i2c_client *client)\n {\n \tstruct v4l2_subdev *sd = i2c_get_clientdata(client);\n-\tstruct ov5647 *ov5647 = to_state(sd);\n+\tstruct ov5647 *sensor = to_sensor(sd);\n \n-\tv4l2_async_unregister_subdev(&ov5647->sd);\n-\tmedia_entity_cleanup(&ov5647->sd.entity);\n-\tv4l2_ctrl_handler_free(&ov5647->ctrls);\n+\tv4l2_async_unregister_subdev(&sensor->sd);\n+\tmedia_entity_cleanup(&sensor->sd.entity);\n+\tv4l2_ctrl_handler_free(&sensor->ctrls);\n \tv4l2_device_unregister_subdev(sd);\n-\tmutex_destroy(&ov5647->lock);\n+\tmutex_destroy(&sensor->lock);\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel","14/25"]}