Commit fd210e31 authored by Raag Jadav's avatar Raag Jadav Committed by Mauro Carvalho Chehab
Browse files

media: ov7740: use SCCB regmap 



Make use of SCCB APIs for regmap operations.
Remove i2c_check_functionality as devm_regmap_init_sccb
does it for us.

Signed-off-by: default avatarRaag Jadav <raagjadav@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 49b20d98

drivers/media/i2c/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1015,7 +1015,7 @@ config VIDEO_OV7670 
config VIDEO_OV7740

	tristate "OmniVision OV7740 sensor support"

	depends on I2C && VIDEO_V4L2

	select REGMAP_I2C

	select REGMAP_SCCB

	help

	  This is a Video4Linux2 sensor driver for the OmniVision

	  OV7740 VGA camera sensor.

drivers/media/i2c/ov7740.c

+1 −9
Original line number Diff line number Diff line
@@ -1068,13 +1068,6 @@ static int ov7740_probe(struct i2c_client *client) 
	struct v4l2_subdev *sd;

	int ret;



	if (!i2c_check_functionality(client->adapter,

				     I2C_FUNC_SMBUS_BYTE_DATA)) {

		dev_err(&client->dev,

			"OV7740: I2C-Adapter doesn't support SMBUS\n");

		return -EIO;

	}



	ov7740 = devm_kzalloc(&client->dev, sizeof(*ov7740), GFP_KERNEL);

	if (!ov7740)

		return -ENOMEM;
@@ -1091,7 +1084,7 @@ static int ov7740_probe(struct i2c_client *client) 
	if (ret)

		return ret;



	ov7740->regmap = devm_regmap_init_i2c(client, &ov7740_regmap_config);

	ov7740->regmap = devm_regmap_init_sccb(client, &ov7740_regmap_config);

	if (IS_ERR(ov7740->regmap)) {

		ret = PTR_ERR(ov7740->regmap);

		dev_err(&client->dev, "Failed to allocate register map: %d\n",
@@ -1100,7 +1093,6 @@ static int ov7740_probe(struct i2c_client *client) 
	}



	sd = &ov7740->subdev;

	client->flags |= I2C_CLIENT_SCCB;

	v4l2_i2c_subdev_init(sd, client, &ov7740_subdev_ops);



#ifdef CONFIG_VIDEO_V4L2_SUBDEV_API

CRA Git | Maintained and supported by SUSTech CRA and CCSE