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

[media] v4l2-clk: add new definition: V4L2_CLK_NAME_SIZE

Make all v4l2-clk's clock name use V4L2_CLK_NAME_SIZE definition.

In future, if the string is increased we just need to change the
V4L2_CLK_NAME_SIZE once.
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 ac2841f3
...@@ -1360,7 +1360,7 @@ static int soc_camera_i2c_init(struct soc_camera_device *icd, ...@@ -1360,7 +1360,7 @@ static int soc_camera_i2c_init(struct soc_camera_device *icd,
struct soc_camera_host_desc *shd = &sdesc->host_desc; struct soc_camera_host_desc *shd = &sdesc->host_desc;
struct i2c_adapter *adap; struct i2c_adapter *adap;
struct v4l2_subdev *subdev; struct v4l2_subdev *subdev;
char clk_name[V4L2_SUBDEV_NAME_SIZE]; char clk_name[V4L2_CLK_NAME_SIZE];
int ret; int ret;
/* First find out how we link the main client */ /* First find out how we link the main client */
...@@ -1526,7 +1526,7 @@ static int scan_async_group(struct soc_camera_host *ici, ...@@ -1526,7 +1526,7 @@ static int scan_async_group(struct soc_camera_host *ici,
struct soc_camera_async_client *sasc; struct soc_camera_async_client *sasc;
struct soc_camera_device *icd; struct soc_camera_device *icd;
struct soc_camera_desc sdesc = {.host_desc.bus_id = ici->nr,}; struct soc_camera_desc sdesc = {.host_desc.bus_id = ici->nr,};
char clk_name[V4L2_SUBDEV_NAME_SIZE]; char clk_name[V4L2_CLK_NAME_SIZE];
unsigned int i; unsigned int i;
int ret; int ret;
...@@ -1632,7 +1632,7 @@ static int soc_of_bind(struct soc_camera_host *ici, ...@@ -1632,7 +1632,7 @@ static int soc_of_bind(struct soc_camera_host *ici,
struct soc_camera_async_client *sasc; struct soc_camera_async_client *sasc;
struct soc_of_info *info; struct soc_of_info *info;
struct i2c_client *client; struct i2c_client *client;
char clk_name[V4L2_SUBDEV_NAME_SIZE + 32]; char clk_name[V4L2_CLK_NAME_SIZE];
int ret; int ret;
/* allocate a new subdev and add match info to it */ /* allocate a new subdev and add match info to it */
......
...@@ -322,7 +322,7 @@ int em28xx_detect_sensor(struct em28xx *dev) ...@@ -322,7 +322,7 @@ int em28xx_detect_sensor(struct em28xx *dev)
int em28xx_init_camera(struct em28xx *dev) int em28xx_init_camera(struct em28xx *dev)
{ {
char clk_name[V4L2_SUBDEV_NAME_SIZE]; char clk_name[V4L2_CLK_NAME_SIZE];
struct i2c_client *client = &dev->i2c_client[dev->def_i2c_bus]; struct i2c_client *client = &dev->i2c_client[dev->def_i2c_bus];
struct i2c_adapter *adap = &dev->i2c_adap[dev->def_i2c_bus]; struct i2c_adapter *adap = &dev->i2c_adap[dev->def_i2c_bus];
struct em28xx_v4l2 *v4l2 = dev->v4l2; struct em28xx_v4l2 *v4l2 = dev->v4l2;
......
...@@ -65,6 +65,8 @@ static inline struct v4l2_clk *v4l2_clk_register_fixed(const char *dev_id, ...@@ -65,6 +65,8 @@ static inline struct v4l2_clk *v4l2_clk_register_fixed(const char *dev_id,
return __v4l2_clk_register_fixed(dev_id, rate, THIS_MODULE); return __v4l2_clk_register_fixed(dev_id, rate, THIS_MODULE);
} }
#define V4L2_CLK_NAME_SIZE 64
#define v4l2_clk_name_i2c(name, size, adap, client) snprintf(name, size, \ #define v4l2_clk_name_i2c(name, size, adap, client) snprintf(name, size, \
"%d-%04x", adap, client) "%d-%04x", adap, client)
......
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