OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

soc-camera: unify i2c camera device platform data 

Unify i2c camera device platform data to point to struct soc_camera_link
for a smooth transition to soc-camera as a platform driver.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Guennadi Liakhovetski 2009-05-12 15:13:32 +00:00 committed by Paul Mundt
parent f73c8f53cc
commit 0a861e9eb7
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/boards/board-ap325rxa.c
View File

@ -417,7 +417,7 @@ static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
},
{
I2C_BOARD_INFO("ov772x", 0x21),
.platform_data = &ov7725_info,
.platform_data = &ov7725_info.link,
},
};

4
arch/sh/boards/mach-migor/setup.c
View File

@ -430,11 +430,11 @@ static struct i2c_board_info migor_i2c_devices[] = {
},
{
I2C_BOARD_INFO("ov772x", 0x21),
.platform_data = &ov7725_info,
.platform_data = &ov7725_info.link,
},
{
I2C_BOARD_INFO("tw9910", 0x45),
.platform_data = &tw9910_info,
.platform_data = &tw9910_info.link,
},
};

6
drivers/media/video/ov772x.c
View File

@ -1067,10 +1067,12 @@ static int ov772x_probe(struct i2c_client *client,
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
int ret;
info = client->dev.platform_data;
if (!info)
if (!client->dev.platform_data)
return -EINVAL;
info = container_of(client->dev.platform_data,
struct ov772x_camera_info, link);
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
dev_err(&adapter->dev,
"I2C-Adapter doesn't support "

6
drivers/media/video/tw9910.c
View File

@ -875,10 +875,12 @@ static int tw9910_probe(struct i2c_client *client,
const struct tw9910_scale_ctrl *scale;
int i, ret;
info = client->dev.platform_data;
if (!info)
if (!client->dev.platform_data)
return -EINVAL;
info = container_of(client->dev.platform_data,
struct tw9910_video_info, link);
if (!i2c_check_functionality(to_i2c_adapter(client->dev.parent),
I2C_FUNC_SMBUS_BYTE_DATA)) {
dev_err(&client->dev,