media: ccs: Clean up ccs_get_hwcfg() a little
Subsystems (2)
Sakari Ailus
maintainerPATCH 1/2 media: ccs: Clean up ccs_get_hwcfg() a little
Fix coding style issues and do other small cleanups in ccs_get_hwcfg().
Signed-off-by Sakari Ailus <[email protected]>
--- drivers/media/i2c/ccs/ccs-core.c | 33 +++++++++++++------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +13 -20
@@ -3145,11 +3145,9 @@ static const struct v4l2_subdev_internal_ops ccs_internal_src_ops = {static int ccs_get_hwconfig (struct ccs_sensor *sensor,struct device *dev) { -struct ccs_hwconfig *hwcfg = &sensor->hwcfg;struct v4l2_fwnode_endpoint bus_cfg = { .bus_type =V4L2_MBUS_UNKNOWN }; -struct fwnode_handle *ep; -struct fwnode_handle *fwnode =dev_fwnode (dev); -unsigned int i; +struct fwnode_handle *fwnode =dev_fwnode (dev), *ep; +struct ccs_hwconfig *hwcfg = &sensor->hwcfg;int rval; ep = fwnode_graph_get_endpoint_by_id(fwnode, 0, 0,
@@ -3176,9 +3174,9 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev)break ;case V4L2_MBUS_CSI1 :case V4L2_MBUS_CCP2 : - hwcfg->csi_signalling_mode = (bus_cfg.bus.mipi_csi1.strobe) ? -SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE : -SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_CLOCK ; + hwcfg->csi_signalling_mode = bus_cfg.bus.mipi_csi1.strobe ? +SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE : +SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_CLOCK ; hwcfg->lanes =1 ;break ;default :
@@ -3187,11 +3185,7 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev) goto out_err; } - rval =fwnode_property_read_u32 (dev_fwnode (dev),"clock-frequency" , - &hwcfg->ext_clk); - -dev_dbg (dev,"clk %u, mode %u\n" , hwcfg->ext_clk, - hwcfg->csi_signalling_mode); +dev_dbg (dev,"signalling mode: %u\n" , hwcfg->csi_signalling_mode);if (!bus_cfg.nr_of_link_frequencies) {dev_warn (dev,"no link frequencies defined\n" );
@@ -3199,23 +3193,22 @@ static int ccs_get_hwconfig(struct ccs_sensor *sensor, struct device *dev) goto out_err; } - hwcfg->op_sys_clock =devm_kcalloc ( - dev, bus_cfg.nr_of_link_frequencies +1 /* guardian */ , -sizeof (*hwcfg->op_sys_clock),GFP_KERNEL ); + hwcfg->op_sys_clock = +devm_kcalloc (dev, + bus_cfg.nr_of_link_frequencies +1 /* guardian */ , +sizeof (*hwcfg->op_sys_clock),GFP_KERNEL );if (!hwcfg->op_sys_clock) { rval = -ENOMEM ; goto out_err; } -for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) { +for (unsigned int i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) { hwcfg->op_sys_clock[i] = bus_cfg.link_frequencies[i];dev_dbg (dev,"freq %u: %lld\n" , i, hwcfg->op_sys_clock[i]); } -v4l2_fwnode_endpoint_free (&bus_cfg); -fwnode_handle_put (ep); - -return 0 ; +fwnode_property_read_u32 (dev_fwnode (dev),"clock-frequency" , + &hwcfg->ext_clk); out_err:v4l2_fwnode_endpoint_free (&bus_cfg);
Signature · 1 line
2.47.3
Sakari Ailus
maintainerPATCH 2/2 media: ccs: Use devm_v4l2_sensor_clk_get()
Rely on devm_v4l2_sensor_clk_get() to obtain the sensor's external clock.
Signed-off-by Sakari Ailus <[email protected]>
--- drivers/media/i2c/ccs/ccs-core.c | 59 ++++++++++++-------------------- 1 file changed, 21 insertions(+), 38 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +21 -38
@@ -3296,47 +3296,30 @@ static int ccs_probe(struct i2c_client *client)return rval; } - sensor->ext_clk =devm_clk_get (&client->dev,NULL ); -if (PTR_ERR (sensor->ext_clk) == -ENOENT ) { -dev_info (&client->dev,"no clock defined, continuing...\n" ); - sensor->ext_clk =NULL ; - }else if (IS_ERR (sensor->ext_clk)) { -dev_err (&client->dev,"could not get clock (%pe)\n" , - sensor->ext_clk); -return -EPROBE_DEFER ; - } - -if (sensor->ext_clk) { -if (sensor->hwcfg.ext_clk) { -unsigned long rate; - - rval =clk_set_rate (sensor->ext_clk, - sensor->hwcfg.ext_clk); -if (rval <0 ) { -dev_err (&client->dev, -"unable to set clock freq to %u\n" , - sensor->hwcfg.ext_clk); -return rval; - } + sensor->ext_clk =devm_v4l2_sensor_clk_get (&client->dev,NULL ); +if (IS_ERR (sensor->ext_clk)) +return dev_err_probe (&client->dev,PTR_ERR (sensor->ext_clk), +"could not get clock\n" ); - rate =clk_get_rate (sensor->ext_clk); -if (rate != sensor->hwcfg.ext_clk) { -dev_err (&client->dev, -"can't set clock freq, asked for %u but got %lu\n" , - sensor->hwcfg.ext_clk, rate); -return -EINVAL ; - } - }else { - sensor->hwcfg.ext_clk =clk_get_rate (sensor->ext_clk); -dev_dbg (&client->dev,"obtained clock freq %u\n" , - sensor->hwcfg.ext_clk); +if (sensor->hwcfg.ext_clk) { +unsigned long rate; + + rval =clk_set_rate (sensor->ext_clk, sensor->hwcfg.ext_clk); +if (rval <0 ) +return dev_err_probe (&client->dev, rval, +"unable to set clock freq to %u\n" , + sensor->hwcfg.ext_clk); + + rate =clk_get_rate (sensor->ext_clk); +if (rate != sensor->hwcfg.ext_clk) { +return dev_err_probe (&client->dev, -EINVAL , +"can't set clock freq, asked for %u but got %lu\n" , + sensor->hwcfg.ext_clk, rate); } - }else if (sensor->hwcfg.ext_clk) { -dev_dbg (&client->dev,"assuming clock freq %u\n" , - sensor->hwcfg.ext_clk); }else { -dev_err (&client->dev,"unable to obtain clock freq\n" ); -return -EINVAL ; + sensor->hwcfg.ext_clk =clk_get_rate (sensor->ext_clk); +dev_dbg (&client->dev,"obtained clock freq %u\n" , + sensor->hwcfg.ext_clk); }if (!sensor->hwcfg.ext_clk) {
Signature · 1 line
2.47.3
Quoted 7 lines · Sakari Ailus
Fix coding style issues and do other small cleanups in
ccs_get_hwcfg().Signed-off-by Sakari Ailus <[email protected]>--- drivers/media/i2c/ccs/ccs-core.c | 33 +++++++++++++------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
Readability goes brrrr! Nice :)
Reviewed-by David Heidelberg <[email protected]>
[...]