|
@@ -1391,8 +1391,8 @@ static int soc_camera_i2c_init(struct soc_camera_device *icd,
|
|
|
ssdd->sd_pdata.regulators = NULL;
|
|
|
shd->board_info->platform_data = ssdd;
|
|
|
|
|
|
- snprintf(clk_name, sizeof(clk_name), "%d-%04x",
|
|
|
- shd->i2c_adapter_id, shd->board_info->addr);
|
|
|
+ v4l2_clk_name_i2c(clk_name, sizeof(clk_name),
|
|
|
+ shd->i2c_adapter_id, shd->board_info->addr);
|
|
|
|
|
|
icd->clk = v4l2_clk_register(&soc_camera_clk_ops, clk_name, icd);
|
|
|
if (IS_ERR(icd->clk)) {
|
|
@@ -1572,8 +1572,9 @@ static int scan_async_group(struct soc_camera_host *ici,
|
|
|
icd->sasc = sasc;
|
|
|
icd->parent = ici->v4l2_dev.dev;
|
|
|
|
|
|
- snprintf(clk_name, sizeof(clk_name), "%d-%04x",
|
|
|
- sasd->asd.match.i2c.adapter_id, sasd->asd.match.i2c.address);
|
|
|
+ v4l2_clk_name_i2c(clk_name, sizeof(clk_name),
|
|
|
+ sasd->asd.match.i2c.adapter_id,
|
|
|
+ sasd->asd.match.i2c.address);
|
|
|
|
|
|
icd->clk = v4l2_clk_register(&soc_camera_clk_ops, clk_name, icd);
|
|
|
if (IS_ERR(icd->clk)) {
|
|
@@ -1674,8 +1675,8 @@ static int soc_of_bind(struct soc_camera_host *ici,
|
|
|
client = of_find_i2c_device_by_node(remote);
|
|
|
|
|
|
if (client)
|
|
|
- snprintf(clk_name, sizeof(clk_name), "%d-%04x",
|
|
|
- client->adapter->nr, client->addr);
|
|
|
+ v4l2_clk_name_i2c(clk_name, sizeof(clk_name),
|
|
|
+ client->adapter->nr, client->addr);
|
|
|
else
|
|
|
snprintf(clk_name, sizeof(clk_name), "of-%s",
|
|
|
of_node_full_name(remote));
|