Skip to content

L
linux
Commit 68cc9d0b authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] I2C: Merge unused address lists in some video drivers 

On top of my previous patch which removes the use of address ranges in
video i2c drivers, this one can save an additional few bytes of memory.
Most of these drivers which do not use I2C_CLIENT_INSMOD initialize the
unused address lists in a less than optimal way. This patch simply
optimizes this, by using a single one-element list instead of 3
different lists with two elements each.

This saves an average 63 bytes on these drivers.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>

diff -ruN linux-2.6.12-rc1-bk5.orig/drivers/media/video/adv7170.c linux-2.6.12-rc1-bk5/drivers/media/video/adv7170.c
parent b3d5496e
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 60 deletions
drivers/media/video/adv7170.c
View file @ 68cc9d0b
...@@ -385,15 +385,13 @@ static unsigned short normal_i2c[] = ...@@ -385,15 +385,13 @@ static unsigned short normal_i2c[] =
I2C_CLIENT_END I2C_CLIENT_END
}; };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force .force = &ignore,
}; };
static struct i2c_driver i2c_driver_adv7170; static struct i2c_driver i2c_driver_adv7170;
......
drivers/media/video/adv7175.c
View file @ 68cc9d0b
...@@ -435,15 +435,13 @@ static unsigned short normal_i2c[] = ...@@ -435,15 +435,13 @@ static unsigned short normal_i2c[] =
I2C_CLIENT_END I2C_CLIENT_END
}; };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force .force = &ignore,
}; };
static struct i2c_driver i2c_driver_adv7175; static struct i2c_driver i2c_driver_adv7175;
......
drivers/media/video/bt819.c
View file @ 68cc9d0b
...@@ -501,15 +501,13 @@ static unsigned short normal_i2c[] = { ...@@ -501,15 +501,13 @@ static unsigned short normal_i2c[] = {
I2C_CLIENT_END, I2C_CLIENT_END,
}; };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force .force = &ignore,
}; };
static struct i2c_driver i2c_driver_bt819; static struct i2c_driver i2c_driver_bt819;
......
drivers/media/video/bt856.c
View file @ 68cc9d0b
...@@ -289,15 +289,13 @@ bt856_command (struct i2c_client *client, ...@@ -289,15 +289,13 @@ bt856_command (struct i2c_client *client,
*/ */
static unsigned short normal_i2c[] = { I2C_BT856 >> 1, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { I2C_BT856 >> 1, I2C_CLIENT_END };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force .force = &ignore,
}; };
static struct i2c_driver i2c_driver_bt856; static struct i2c_driver i2c_driver_bt856;
......
drivers/media/video/saa7110.c
View file @ 68cc9d0b
...@@ -464,15 +464,13 @@ static unsigned short normal_i2c[] = { ...@@ -464,15 +464,13 @@ static unsigned short normal_i2c[] = {
I2C_CLIENT_END I2C_CLIENT_END
}; };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force .force = &ignore,
}; };
static struct i2c_driver i2c_driver_saa7110; static struct i2c_driver i2c_driver_saa7110;
......
drivers/media/video/saa7111.c
View file @ 68cc9d0b
...@@ -483,15 +483,13 @@ saa7111_command (struct i2c_client *client, ...@@ -483,15 +483,13 @@ saa7111_command (struct i2c_client *client,
*/ */
static unsigned short normal_i2c[] = { I2C_SAA7111 >> 1, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { I2C_SAA7111 >> 1, I2C_CLIENT_END };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force .force = &ignore,
}; };
static struct i2c_driver i2c_driver_saa7111; static struct i2c_driver i2c_driver_saa7111;
......
drivers/media/video/saa7114.c
View file @ 68cc9d0b
...@@ -821,15 +821,13 @@ saa7114_command (struct i2c_client *client, ...@@ -821,15 +821,13 @@ saa7114_command (struct i2c_client *client,
static unsigned short normal_i2c[] = static unsigned short normal_i2c[] =
{ I2C_SAA7114 >> 1, I2C_SAA7114A >> 1, I2C_CLIENT_END }; { I2C_SAA7114 >> 1, I2C_SAA7114A >> 1, I2C_CLIENT_END };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force .force = &ignore,
}; };
static struct i2c_driver i2c_driver_saa7114; static struct i2c_driver i2c_driver_saa7114;
......
drivers/media/video/saa7185.c
View file @ 68cc9d0b
...@@ -381,15 +381,13 @@ saa7185_command (struct i2c_client *client, ...@@ -381,15 +381,13 @@ saa7185_command (struct i2c_client *client,
*/ */
static unsigned short normal_i2c[] = { I2C_SAA7185 >> 1, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { I2C_SAA7185 >> 1, I2C_CLIENT_END };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force .force = &ignore,
}; };
static struct i2c_driver i2c_driver_saa7185; static struct i2c_driver i2c_driver_saa7185;
......
drivers/media/video/tuner-3036.c
View file @ 68cc9d0b
...@@ -35,15 +35,13 @@ static struct i2c_client client_template; ...@@ -35,15 +35,13 @@ static struct i2c_client client_template;
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END }; static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force, .force = &ignore,
}; };
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
......
drivers/media/video/vpx3220.c
View file @ 68cc9d0b
...@@ -570,15 +570,13 @@ static unsigned short normal_i2c[] = ...@@ -570,15 +570,13 @@ static unsigned short normal_i2c[] =
I2C_CLIENT_END I2C_CLIENT_END
}; };
static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; static unsigned short ignore = I2C_CLIENT_END;
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = { static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c, .normal_i2c = normal_i2c,
.probe = probe, .probe = &ignore,
.ignore = ignore, .ignore = &ignore,
.force = force .force = &ignore,
}; };
static struct i2c_driver vpx3220_i2c_driver; static struct i2c_driver vpx3220_i2c_driver;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7