leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] media: i2c: ths7303: make the pdata as a constant pointer

Browse Source 
generally the pdata needs to be a constant pointer in the device
state structure. This patch makes the pdata as a constant pointer
and alongside returns -EINVAL when pdata is NULL.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Lad, Prabhakar 2013-05-25 13:39:36 -03:00 committed by Mauro Carvalho Chehab
parent 8524ce558a
commit dd8c393b3c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/i2c/ths7303.c
View File

@ -35,7 +35,7 @@
struct ths7303_state { struct ths7303_state {
struct v4l2_subdev sd; struct v4l2_subdev sd;
struct ths7303_platform_data pdata; const struct ths7303_platform_data *pdata;
struct v4l2_bt_timings bt; struct v4l2_bt_timings bt;
int std_id; int std_id;
int stream_on; int stream_on;
@ -89,7 +89,7 @@ int ths7303_setval(struct v4l2_subdev *sd, enum ths7303_filter_mode mode)
{ {
struct i2c_client *client = v4l2_get_subdevdata(sd); struct i2c_client *client = v4l2_get_subdevdata(sd);
struct ths7303_state *state = to_state(sd); struct ths7303_state *state = to_state(sd);
struct ths7303_platform_data *pdata = &state->pdata; const struct ths7303_platform_data *pdata = state->pdata;
u8 val, sel = 0; u8 val, sel = 0;
int err, disable = 0; int err, disable = 0;
@ -356,6 +356,11 @@ static int ths7303_probe(struct i2c_client *client,
struct ths7303_state *state; struct ths7303_state *state;
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
if (pdata == NULL) {
dev_err(&client->dev, "No platform data\n");
return -EINVAL;
}
if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -ENODEV; return -ENODEV;
@ -367,11 +372,7 @@ static int ths7303_probe(struct i2c_client *client,
if (!state) if (!state)
return -ENOMEM; return -ENOMEM;
if (!pdata) state->pdata = pdata;
v4l_warn(client, "No platform data, using default data!\n");
else
state->pdata = *pdata;
sd = &state->sd; sd = &state->sd;
v4l2_i2c_subdev_init(sd, client, &ths7303_ops); v4l2_i2c_subdev_init(sd, client, &ths7303_ops);