2023-06-16 14:06:32

by Tomi Valkeinen

Subject: [PATCH v14 13/18] media: i2c: ds90ub953: Use v4l2_fwnode_endpoint_parse()

Use v4l2_fwnode_endpoint_parse() to parse the sink endpoint parameters.

Signed-off-by: Tomi Valkeinen <[email protected]>
---
drivers/media/i2c/ds90ub953.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/media/i2c/ds90ub953.c b/drivers/media/i2c/ds90ub953.c
index 1e3827a60029..5b586855c77b 100644
--- a/drivers/media/i2c/ds90ub953.c
+++ b/drivers/media/i2c/ds90ub953.c
@@ -25,6 +25,8 @@
#include <media/i2c/ds90ub9xx.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-event.h>
+#include <media/v4l2-fwnode.h>
+#include <media/v4l2-mediabus.h>
#include <media/v4l2-subdev.h>

#define UB953_PAD_SINK 0
@@ -1111,7 +1113,9 @@ static const struct regmap_config ub953_regmap_config = {
static int ub953_parse_dt(struct ub953_data *priv)
{
struct device *dev = &priv->client->dev;
+ struct v4l2_fwnode_endpoint vep = {};
struct fwnode_handle *ep_fwnode;
+ unsigned char nlanes;
int ret;

ep_fwnode = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev),
@@ -1119,19 +1123,22 @@ static int ub953_parse_dt(struct ub953_data *priv)
if (!ep_fwnode)
return dev_err_probe(dev, -ENOENT, "no endpoint found\n");

- ret = fwnode_property_count_u32(ep_fwnode, "data-lanes");
+ vep.bus_type = V4L2_MBUS_CSI2_DPHY;
+ ret = v4l2_fwnode_endpoint_parse(ep_fwnode, &vep);

fwnode_handle_put(ep_fwnode);

- if (ret < 0)
+ if (ret)
return dev_err_probe(dev, ret,
- "failed to parse property 'data-lanes'\n");
+ "failed to parse sink endpoint data\n");
+
+ nlanes = vep.bus.mipi_csi2.num_data_lanes;

- if (ret != 1 && ret != 2 && ret != 4)
+ if (nlanes != 1 && nlanes != 2 && nlanes != 4)
return dev_err_probe(dev, -EINVAL,
- "bad number of data-lanes: %d\n", ret);
+ "bad number of data-lanes: %d\n", nlanes);

- priv->num_data_lanes = ret;
+ priv->num_data_lanes = nlanes;

return 0;
}
--
2.34.1

2023-06-16 14:35:03

by Andy Shevchenko

Subject: Re: [PATCH v14 13/18] media: i2c: ds90ub953: Use v4l2_fwnode_endpoint_parse()

On Fri, Jun 16, 2023 at 04:59:17PM +0300, Tomi Valkeinen wrote:
> Use v4l2_fwnode_endpoint_parse() to parse the sink endpoint parameters.

> + nlanes = vep.bus.mipi_csi2.num_data_lanes;
>

I would also drop this blank line now.

> - if (ret != 1 && ret != 2 && ret != 4)
> + if (nlanes != 1 && nlanes != 2 && nlanes != 4)

Isn't the following cleaner?

if (!is_power_of_2(nlanes) || nlanes > 4)

> return dev_err_probe(dev, -EINVAL,
> - "bad number of data-lanes: %d\n", ret);
> + "bad number of data-lanes: %d\n", nlanes);

--
With Best Regards,
Andy Shevchenko

2023-06-19 09:11:35

by Tomi Valkeinen

Subject: Re: [PATCH v14 13/18] media: i2c: ds90ub953: Use v4l2_fwnode_endpoint_parse()

On 16/06/2023 17:24, Andy Shevchenko wrote:
> On Fri, Jun 16, 2023 at 04:59:17PM +0300, Tomi Valkeinen wrote:
>> Use v4l2_fwnode_endpoint_parse() to parse the sink endpoint parameters.
>
>> + nlanes = vep.bus.mipi_csi2.num_data_lanes;
>>
>
> I would also drop this blank line now.

Ok.

>> - if (ret != 1 && ret != 2 && ret != 4)
>> + if (nlanes != 1 && nlanes != 2 && nlanes != 4)
>
> Isn't the following cleaner?
>
> if (!is_power_of_2(nlanes) || nlanes > 4)

No, I don't think so... The current one is more human-readable.

>> return dev_err_probe(dev, -EINVAL,
>> - "bad number of data-lanes: %d\n", ret);
>> + "bad number of data-lanes: %d\n", nlanes);
>

Tomi