Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] media: i2c: ov2659: Use v4l2_of_alloc_parse_endpoint()

Browse source 
Instead of parsing the link-frequencies property in the driver, let
v4l2_of_alloc_parse_endpoint() do it.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Lad, Prabhakar 2015-04-15 18:14:17 -03:00 committed by Mauro Carvalho Chehab
parent 7f099a7558
commit b3ab190f1c
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/media/i2c/ov2659.c
View file

@ -1340,8 +1340,8 @@ static struct ov2659_platform_data *
ov2659_get_pdata(struct i2c_client *client) ov2659_get_pdata(struct i2c_client *client)
{ {
struct ov2659_platform_data *pdata; struct ov2659_platform_data *pdata;
struct v4l2_of_endpoint *bus_cfg;
struct device_node *endpoint; struct device_node *endpoint;
int ret;
if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node) if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)
return client->dev.platform_data; return client->dev.platform_data;
@ -1350,18 +1350,27 @@ ov2659_get_pdata(struct i2c_client *client)
if (!endpoint) if (!endpoint)
return NULL; return NULL;
bus_cfg = v4l2_of_alloc_parse_endpoint(endpoint);
if (IS_ERR(bus_cfg)) {
pdata = NULL;
goto done;
}
pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
if (!pdata) if (!pdata)
goto done; goto done;
ret = of_property_read_u64(endpoint, "link-frequencies", if (!bus_cfg->nr_of_link_frequencies) {
&pdata->link_frequency); dev_err(&client->dev,
if (ret) { "link-frequencies property not found or too many\n");
dev_err(&client->dev, "link-frequencies property not found\n");
pdata = NULL; pdata = NULL;
goto done;
} }
pdata->link_frequency = bus_cfg->link_frequencies[0];
done: done:
v4l2_of_free_endpoint(bus_cfg);
of_node_put(endpoint); of_node_put(endpoint);
return pdata; return pdata;
} }