mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 07:38:10 +00:00
media: i2c: imx219: Use dev_err_probe on probe
Drop dev_err() and use the dev_err_probe() helper on probe path. No functional changes intended. Signed-off-by: Umang Jain <umang.jain@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
05e8c95e75
commit
03479d5673
1 changed files with 35 additions and 42 deletions
|
@ -551,8 +551,7 @@ static int imx219_init_controls(struct imx219 *imx219)
|
||||||
|
|
||||||
if (ctrl_hdlr->error) {
|
if (ctrl_hdlr->error) {
|
||||||
ret = ctrl_hdlr->error;
|
ret = ctrl_hdlr->error;
|
||||||
dev_err(&client->dev, "%s control init failed (%d)\n",
|
dev_err_probe(&client->dev, ret, "Control init failed\n");
|
||||||
__func__, ret);
|
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1024,17 +1023,15 @@ static int imx219_identify_module(struct imx219 *imx219)
|
||||||
u64 val;
|
u64 val;
|
||||||
|
|
||||||
ret = cci_read(imx219->regmap, IMX219_REG_CHIP_ID, &val, NULL);
|
ret = cci_read(imx219->regmap, IMX219_REG_CHIP_ID, &val, NULL);
|
||||||
if (ret) {
|
if (ret)
|
||||||
dev_err(&client->dev, "failed to read chip id %x\n",
|
return dev_err_probe(&client->dev, ret,
|
||||||
|
"failed to read chip id %x\n",
|
||||||
IMX219_CHIP_ID);
|
IMX219_CHIP_ID);
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (val != IMX219_CHIP_ID) {
|
if (val != IMX219_CHIP_ID)
|
||||||
dev_err(&client->dev, "chip id mismatch: %x!=%llx\n",
|
return dev_err_probe(&client->dev, -EIO,
|
||||||
|
"chip id mismatch: %x!=%llx\n",
|
||||||
IMX219_CHIP_ID, val);
|
IMX219_CHIP_ID, val);
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1048,34 +1045,35 @@ static int imx219_check_hwcfg(struct device *dev, struct imx219 *imx219)
|
||||||
int ret = -EINVAL;
|
int ret = -EINVAL;
|
||||||
|
|
||||||
endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
|
endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
|
||||||
if (!endpoint) {
|
if (!endpoint)
|
||||||
dev_err(dev, "endpoint node not found\n");
|
return dev_err_probe(dev, -EINVAL, "endpoint node not found\n");
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep_cfg)) {
|
if (v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep_cfg)) {
|
||||||
dev_err(dev, "could not parse endpoint\n");
|
dev_err_probe(dev, -EINVAL, "could not parse endpoint\n");
|
||||||
goto error_out;
|
goto error_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check the number of MIPI CSI2 data lanes */
|
/* Check the number of MIPI CSI2 data lanes */
|
||||||
if (ep_cfg.bus.mipi_csi2.num_data_lanes != 2 &&
|
if (ep_cfg.bus.mipi_csi2.num_data_lanes != 2 &&
|
||||||
ep_cfg.bus.mipi_csi2.num_data_lanes != 4) {
|
ep_cfg.bus.mipi_csi2.num_data_lanes != 4) {
|
||||||
dev_err(dev, "only 2 or 4 data lanes are currently supported\n");
|
dev_err_probe(dev, -EINVAL,
|
||||||
|
"only 2 or 4 data lanes are currently supported\n");
|
||||||
goto error_out;
|
goto error_out;
|
||||||
}
|
}
|
||||||
imx219->lanes = ep_cfg.bus.mipi_csi2.num_data_lanes;
|
imx219->lanes = ep_cfg.bus.mipi_csi2.num_data_lanes;
|
||||||
|
|
||||||
/* Check the link frequency set in device tree */
|
/* Check the link frequency set in device tree */
|
||||||
if (!ep_cfg.nr_of_link_frequencies) {
|
if (!ep_cfg.nr_of_link_frequencies) {
|
||||||
dev_err(dev, "link-frequency property not found in DT\n");
|
dev_err_probe(dev, -EINVAL,
|
||||||
|
"link-frequency property not found in DT\n");
|
||||||
goto error_out;
|
goto error_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ep_cfg.nr_of_link_frequencies != 1 ||
|
if (ep_cfg.nr_of_link_frequencies != 1 ||
|
||||||
(ep_cfg.link_frequencies[0] != ((imx219->lanes == 2) ?
|
(ep_cfg.link_frequencies[0] != ((imx219->lanes == 2) ?
|
||||||
IMX219_DEFAULT_LINK_FREQ : IMX219_DEFAULT_LINK_FREQ_4LANE))) {
|
IMX219_DEFAULT_LINK_FREQ : IMX219_DEFAULT_LINK_FREQ_4LANE))) {
|
||||||
dev_err(dev, "Link frequency not supported: %lld\n",
|
dev_err_probe(dev, -EINVAL,
|
||||||
|
"Link frequency not supported: %lld\n",
|
||||||
ep_cfg.link_frequencies[0]);
|
ep_cfg.link_frequencies[0]);
|
||||||
goto error_out;
|
goto error_out;
|
||||||
}
|
}
|
||||||
|
@ -1107,31 +1105,25 @@ static int imx219_probe(struct i2c_client *client)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
imx219->regmap = devm_cci_regmap_init_i2c(client, 16);
|
imx219->regmap = devm_cci_regmap_init_i2c(client, 16);
|
||||||
if (IS_ERR(imx219->regmap)) {
|
if (IS_ERR(imx219->regmap))
|
||||||
ret = PTR_ERR(imx219->regmap);
|
return dev_err_probe(dev, PTR_ERR(imx219->regmap),
|
||||||
dev_err(dev, "failed to initialize CCI: %d\n", ret);
|
"failed to initialize CCI\n");
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Get system clock (xclk) */
|
/* Get system clock (xclk) */
|
||||||
imx219->xclk = devm_clk_get(dev, NULL);
|
imx219->xclk = devm_clk_get(dev, NULL);
|
||||||
if (IS_ERR(imx219->xclk)) {
|
if (IS_ERR(imx219->xclk))
|
||||||
dev_err(dev, "failed to get xclk\n");
|
return dev_err_probe(dev, PTR_ERR(imx219->xclk),
|
||||||
return PTR_ERR(imx219->xclk);
|
"failed to get xclk\n");
|
||||||
}
|
|
||||||
|
|
||||||
imx219->xclk_freq = clk_get_rate(imx219->xclk);
|
imx219->xclk_freq = clk_get_rate(imx219->xclk);
|
||||||
if (imx219->xclk_freq != IMX219_XCLK_FREQ) {
|
if (imx219->xclk_freq != IMX219_XCLK_FREQ)
|
||||||
dev_err(dev, "xclk frequency not supported: %d Hz\n",
|
return dev_err_probe(dev, -EINVAL,
|
||||||
|
"xclk frequency not supported: %d Hz\n",
|
||||||
imx219->xclk_freq);
|
imx219->xclk_freq);
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = imx219_get_regulators(imx219);
|
ret = imx219_get_regulators(imx219);
|
||||||
if (ret) {
|
if (ret)
|
||||||
dev_err(dev, "failed to get regulators\n");
|
return dev_err_probe(dev, ret, "failed to get regulators\n");
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Request optional enable pin */
|
/* Request optional enable pin */
|
||||||
imx219->reset_gpio = devm_gpiod_get_optional(dev, "reset",
|
imx219->reset_gpio = devm_gpiod_get_optional(dev, "reset",
|
||||||
|
@ -1183,20 +1175,21 @@ static int imx219_probe(struct i2c_client *client)
|
||||||
|
|
||||||
ret = media_entity_pads_init(&imx219->sd.entity, 1, &imx219->pad);
|
ret = media_entity_pads_init(&imx219->sd.entity, 1, &imx219->pad);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(dev, "failed to init entity pads: %d\n", ret);
|
dev_err_probe(dev, ret, "failed to init entity pads\n");
|
||||||
goto error_handler_free;
|
goto error_handler_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
imx219->sd.state_lock = imx219->ctrl_handler.lock;
|
imx219->sd.state_lock = imx219->ctrl_handler.lock;
|
||||||
ret = v4l2_subdev_init_finalize(&imx219->sd);
|
ret = v4l2_subdev_init_finalize(&imx219->sd);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(dev, "subdev init error: %d\n", ret);
|
dev_err_probe(dev, ret, "subdev init error\n");
|
||||||
goto error_media_entity;
|
goto error_media_entity;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = v4l2_async_register_subdev_sensor(&imx219->sd);
|
ret = v4l2_async_register_subdev_sensor(&imx219->sd);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(dev, "failed to register sensor sub-device: %d\n", ret);
|
dev_err_probe(dev, ret,
|
||||||
|
"failed to register sensor sub-device\n");
|
||||||
goto error_subdev_cleanup;
|
goto error_subdev_cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue