Commit 1524bb76 authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab
Browse files

media: i2c: rdacm20: Embed 'serializer' field 



There's no reason to allocate dynamically the 'serializer' field in
the driver structure.

Embed the field and adjust all its users in the driver.

Signed-off-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 2b821698

drivers/media/i2c/rdacm20.c

+15 −21
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static const struct ov10635_reg { 


struct rdacm20_device {

	struct device			*dev;

	struct max9271_device		*serializer;

	struct max9271_device		serializer;

	struct i2c_client		*sensor;

	struct v4l2_subdev		sd;

	struct media_pad		pad;
@@ -399,7 +399,7 @@ static int rdacm20_s_stream(struct v4l2_subdev *sd, int enable) 
{

	struct rdacm20_device *dev = sd_to_rdacm20(sd);



	return max9271_set_serial_link(dev->serializer, enable);

	return max9271_set_serial_link(&dev->serializer, enable);

}



static int rdacm20_enum_mbus_code(struct v4l2_subdev *sd,
@@ -455,10 +455,10 @@ static int rdacm20_initialize(struct rdacm20_device *dev) 
	unsigned int retry = 3;

	int ret;



	max9271_wake_up(dev->serializer);

	max9271_wake_up(&dev->serializer);



	/* Serial link disabled during config as it needs a valid pixel clock. */

	ret = max9271_set_serial_link(dev->serializer, false);

	ret = max9271_set_serial_link(&dev->serializer, false);

	if (ret)

		return ret;
@@ -466,35 +466,35 @@ static int rdacm20_initialize(struct rdacm20_device *dev) 
	 *  Ensure that we have a good link configuration before attempting to

	 *  identify the device.

	 */

	max9271_configure_i2c(dev->serializer, MAX9271_I2CSLVSH_469NS_234NS |

	max9271_configure_i2c(&dev->serializer, MAX9271_I2CSLVSH_469NS_234NS |

						MAX9271_I2CSLVTO_1024US |

						MAX9271_I2CMSTBT_105KBPS);



	max9271_configure_gmsl_link(dev->serializer);

	max9271_configure_gmsl_link(&dev->serializer);



	ret = max9271_verify_id(dev->serializer);

	ret = max9271_verify_id(&dev->serializer);

	if (ret < 0)

		return ret;



	ret = max9271_set_address(dev->serializer, dev->addrs[0]);

	ret = max9271_set_address(&dev->serializer, dev->addrs[0]);

	if (ret < 0)

		return ret;

	dev->serializer->client->addr = dev->addrs[0];

	dev->serializer.client->addr = dev->addrs[0];



	/*

	 * Reset the sensor by cycling the OV10635 reset signal connected to the

	 * MAX9271 GPIO1 and verify communication with the OV10635.

	 */

	ret = max9271_enable_gpios(dev->serializer, MAX9271_GPIO1OUT);

	ret = max9271_enable_gpios(&dev->serializer, MAX9271_GPIO1OUT);

	if (ret)

		return ret;



	ret = max9271_clear_gpios(dev->serializer, MAX9271_GPIO1OUT);

	ret = max9271_clear_gpios(&dev->serializer, MAX9271_GPIO1OUT);

	if (ret)

		return ret;

	usleep_range(10000, 15000);



	ret = max9271_set_gpios(dev->serializer, MAX9271_GPIO1OUT);

	ret = max9271_set_gpios(&dev->serializer, MAX9271_GPIO1OUT);

	if (ret)

		return ret;

	usleep_range(10000, 15000);
@@ -552,13 +552,7 @@ static int rdacm20_probe(struct i2c_client *client) 
	if (!dev)

		return -ENOMEM;

	dev->dev = &client->dev;



	dev->serializer = devm_kzalloc(&client->dev, sizeof(*dev->serializer),

				       GFP_KERNEL);

	if (!dev->serializer)

		return -ENOMEM;



	dev->serializer->client = client;

	dev->serializer.client = client;



	ret = of_property_read_u32_array(client->dev.of_node, "reg",

					 dev->addrs, 2);