forked from luck/tmp_suning_uos_patched
[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: Josh Wu <josh.wu@atmel.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
ac2841f3b8
commit
3d83078a08
|
@ -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 i2c_adapter *adap;
|
||||
struct v4l2_subdev *subdev;
|
||||
char clk_name[V4L2_SUBDEV_NAME_SIZE];
|
||||
char clk_name[V4L2_CLK_NAME_SIZE];
|
||||
int ret;
|
||||
|
||||
/* First find out how we link the main client */
|
||||
|
@ -1526,7 +1526,7 @@ static int scan_async_group(struct soc_camera_host *ici,
|
|||
struct soc_camera_async_client *sasc;
|
||||
struct soc_camera_device *icd;
|
||||
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;
|
||||
int ret;
|
||||
|
||||
|
@ -1632,7 +1632,7 @@ static int soc_of_bind(struct soc_camera_host *ici,
|
|||
struct soc_camera_async_client *sasc;
|
||||
struct soc_of_info *info;
|
||||
struct i2c_client *client;
|
||||
char clk_name[V4L2_SUBDEV_NAME_SIZE + 32];
|
||||
char clk_name[V4L2_CLK_NAME_SIZE];
|
||||
int ret;
|
||||
|
||||
/* allocate a new subdev and add match info to it */
|
||||
|
|
|
@ -322,7 +322,7 @@ int em28xx_detect_sensor(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_adapter *adap = &dev->i2c_adap[dev->def_i2c_bus];
|
||||
struct em28xx_v4l2 *v4l2 = dev->v4l2;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
#define V4L2_CLK_NAME_SIZE 64
|
||||
|
||||
#define v4l2_clk_name_i2c(name, size, adap, client) snprintf(name, size, \
|
||||
"%d-%04x", adap, client)
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user