Commit b76a3263 authored by Németh Márton's avatar Németh Márton Committed by Greg Kroah-Hartman

staging: make i2c device id constant

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: default avatarNémeth Márton <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a457732b
...@@ -667,7 +667,7 @@ static int s2250_remove(struct i2c_client *client) ...@@ -667,7 +667,7 @@ static int s2250_remove(struct i2c_client *client)
return 0; return 0;
} }
static struct i2c_device_id s2250_id[] = { static const struct i2c_device_id s2250_id[] = {
{ "s2250", 0 }, { "s2250", 0 },
{ } { }
}; };
......
...@@ -77,7 +77,7 @@ static int wis_ov7640_remove(struct i2c_client *client) ...@@ -77,7 +77,7 @@ static int wis_ov7640_remove(struct i2c_client *client)
return 0; return 0;
} }
static struct i2c_device_id wis_ov7640_id[] = { static const struct i2c_device_id wis_ov7640_id[] = {
{ "wis_ov7640", 0 }, { "wis_ov7640", 0 },
{ } { }
}; };
......
...@@ -304,7 +304,7 @@ static int wis_saa7113_remove(struct i2c_client *client) ...@@ -304,7 +304,7 @@ static int wis_saa7113_remove(struct i2c_client *client)
return 0; return 0;
} }
static struct i2c_device_id wis_saa7113_id[] = { static const struct i2c_device_id wis_saa7113_id[] = {
{ "wis_saa7113", 0 }, { "wis_saa7113", 0 },
{ } { }
}; };
......
...@@ -437,7 +437,7 @@ static int wis_saa7115_remove(struct i2c_client *client) ...@@ -437,7 +437,7 @@ static int wis_saa7115_remove(struct i2c_client *client)
return 0; return 0;
} }
static struct i2c_device_id wis_saa7115_id[] = { static const struct i2c_device_id wis_saa7115_id[] = {
{ "wis_saa7115", 0 }, { "wis_saa7115", 0 },
{ } { }
}; };
......
...@@ -688,7 +688,7 @@ static int wis_sony_tuner_remove(struct i2c_client *client) ...@@ -688,7 +688,7 @@ static int wis_sony_tuner_remove(struct i2c_client *client)
return 0; 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 }, { "wis_sony_tuner", 0 },
{ } { }
}; };
......
...@@ -327,7 +327,7 @@ static int wis_tw2804_remove(struct i2c_client *client) ...@@ -327,7 +327,7 @@ static int wis_tw2804_remove(struct i2c_client *client)
return 0; return 0;
} }
static struct i2c_device_id wis_tw2804_id[] = { static const struct i2c_device_id wis_tw2804_id[] = {
{ "wis_tw2804", 0 }, { "wis_tw2804", 0 },
{ } { }
}; };
......
...@@ -309,7 +309,7 @@ static int wis_tw9903_remove(struct i2c_client *client) ...@@ -309,7 +309,7 @@ static int wis_tw9903_remove(struct i2c_client *client)
return 0; return 0;
} }
static struct i2c_device_id wis_tw9903_id[] = { static const struct i2c_device_id wis_tw9903_id[] = {
{ "wis_tw9903", 0 }, { "wis_tw9903", 0 },
{ } { }
}; };
......
...@@ -82,7 +82,7 @@ static int wis_uda1342_remove(struct i2c_client *client) ...@@ -82,7 +82,7 @@ static int wis_uda1342_remove(struct i2c_client *client)
return 0; return 0;
} }
static struct i2c_device_id wis_uda1342_id[] = { static const struct i2c_device_id wis_uda1342_id[] = {
{ "wis_uda1342", 0 }, { "wis_uda1342", 0 },
{ } { }
}; };
......
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