Skip to content

Commit

Permalink
staging: make i2c device id constant
Browse files Browse the repository at this point in the history
The id_table field of the struct i2c_driver is constant in <linux/i2c.h>
so it is worth to make the initialization data also constant.

The semantic match that finds this kind of pattern is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r@
disable decl_init,const_decl_init;
identifier I1, I2, x;
@@
	struct I1 {
	  ...
	  const struct I2 *x;
	  ...
	};
@s@
identifier r.I1, y;
identifier r.x, E;
@@
	struct I1 y = {
	  .x = E,
	};
@c@
identifier r.I2;
identifier s.E;
@@
	const struct I2 E[] = ... ;
@depends on !c@
identifier r.I2;
identifier s.E;
@@
+	const
	struct I2 E[] = ...;
// </smpl>

Signed-off-by: Németh Márton <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Németh Márton authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent a457732 commit b76a326
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/go7007/s2250-board.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ static int s2250_remove(struct i2c_client *client)
return 0;
}

static struct i2c_device_id s2250_id[] = {
static const struct i2c_device_id s2250_id[] = {
{ "s2250", 0 },
{ }
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/go7007/wis-ov7640.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ static int wis_ov7640_remove(struct i2c_client *client)
return 0;
}

static struct i2c_device_id wis_ov7640_id[] = {
static const struct i2c_device_id wis_ov7640_id[] = {
{ "wis_ov7640", 0 },
{ }
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/go7007/wis-saa7113.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ static int wis_saa7113_remove(struct i2c_client *client)
return 0;
}

static struct i2c_device_id wis_saa7113_id[] = {
static const struct i2c_device_id wis_saa7113_id[] = {
{ "wis_saa7113", 0 },
{ }
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/go7007/wis-saa7115.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ static int wis_saa7115_remove(struct i2c_client *client)
return 0;
}

static struct i2c_device_id wis_saa7115_id[] = {
static const struct i2c_device_id wis_saa7115_id[] = {
{ "wis_saa7115", 0 },
{ }
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/go7007/wis-sony-tuner.c
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ static int wis_sony_tuner_remove(struct i2c_client *client)
return 0;
}

static struct i2c_device_id wis_sony_tuner_id[] = {
static const struct i2c_device_id wis_sony_tuner_id[] = {
{ "wis_sony_tuner", 0 },
{ }
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/go7007/wis-tw2804.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ static int wis_tw2804_remove(struct i2c_client *client)
return 0;
}

static struct i2c_device_id wis_tw2804_id[] = {
static const struct i2c_device_id wis_tw2804_id[] = {
{ "wis_tw2804", 0 },
{ }
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/go7007/wis-tw9903.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static int wis_tw9903_remove(struct i2c_client *client)
return 0;
}

static struct i2c_device_id wis_tw9903_id[] = {
static const struct i2c_device_id wis_tw9903_id[] = {
{ "wis_tw9903", 0 },
{ }
};
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/go7007/wis-uda1342.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static int wis_uda1342_remove(struct i2c_client *client)
return 0;
}

static struct i2c_device_id wis_uda1342_id[] = {
static const struct i2c_device_id wis_uda1342_id[] = {
{ "wis_uda1342", 0 },
{ }
};
Expand Down

0 comments on commit b76a326

Please sign in to comment.