Commit af4d8347 authored by Josh Wu's avatar Josh Wu Committed by Mauro Carvalho Chehab

[media] soc_camera: get the clock name by using macro: v4l2_clk_name_i2c()

Since v4l2_clk_name_i2c() is defined, reuse it.
Signed-off-by: default avatarJosh Wu <josh.wu@atmel.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent a41f9b41
...@@ -1391,8 +1391,8 @@ static int soc_camera_i2c_init(struct soc_camera_device *icd, ...@@ -1391,8 +1391,8 @@ static int soc_camera_i2c_init(struct soc_camera_device *icd,
ssdd->sd_pdata.regulators = NULL; ssdd->sd_pdata.regulators = NULL;
shd->board_info->platform_data = ssdd; shd->board_info->platform_data = ssdd;
snprintf(clk_name, sizeof(clk_name), "%d-%04x", v4l2_clk_name_i2c(clk_name, sizeof(clk_name),
shd->i2c_adapter_id, shd->board_info->addr); shd->i2c_adapter_id, shd->board_info->addr);
icd->clk = v4l2_clk_register(&soc_camera_clk_ops, clk_name, icd); icd->clk = v4l2_clk_register(&soc_camera_clk_ops, clk_name, icd);
if (IS_ERR(icd->clk)) { if (IS_ERR(icd->clk)) {
...@@ -1572,8 +1572,9 @@ static int scan_async_group(struct soc_camera_host *ici, ...@@ -1572,8 +1572,9 @@ static int scan_async_group(struct soc_camera_host *ici,
icd->sasc = sasc; icd->sasc = sasc;
icd->parent = ici->v4l2_dev.dev; icd->parent = ici->v4l2_dev.dev;
snprintf(clk_name, sizeof(clk_name), "%d-%04x", v4l2_clk_name_i2c(clk_name, sizeof(clk_name),
sasd->asd.match.i2c.adapter_id, sasd->asd.match.i2c.address); sasd->asd.match.i2c.adapter_id,
sasd->asd.match.i2c.address);
icd->clk = v4l2_clk_register(&soc_camera_clk_ops, clk_name, icd); icd->clk = v4l2_clk_register(&soc_camera_clk_ops, clk_name, icd);
if (IS_ERR(icd->clk)) { if (IS_ERR(icd->clk)) {
...@@ -1674,8 +1675,8 @@ static int soc_of_bind(struct soc_camera_host *ici, ...@@ -1674,8 +1675,8 @@ static int soc_of_bind(struct soc_camera_host *ici,
client = of_find_i2c_device_by_node(remote); client = of_find_i2c_device_by_node(remote);
if (client) if (client)
snprintf(clk_name, sizeof(clk_name), "%d-%04x", v4l2_clk_name_i2c(clk_name, sizeof(clk_name),
client->adapter->nr, client->addr); client->adapter->nr, client->addr);
else else
snprintf(clk_name, sizeof(clk_name), "of-%s", snprintf(clk_name, sizeof(clk_name), "of-%s",
of_node_full_name(remote)); of_node_full_name(remote));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment