Commit 73b7d92f authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds

matroxfb: i2c structure templates clean-up

Clean up the use of structure templates in i2c-matroxfb. In this case
it's more efficient to initialize the few fields we need individually.
This makes i2c-matroxfb.ko 16% smaller on my system.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: Petr Vandrovec <VANDROVE@vc.cvut.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ede40f8
...@@ -87,13 +87,7 @@ static int matroxfb_gpio_getscl(void* data) { ...@@ -87,13 +87,7 @@ static int matroxfb_gpio_getscl(void* data) {
return (matroxfb_read_gpio(b->minfo) & b->mask.clock) ? 1 : 0; return (matroxfb_read_gpio(b->minfo) & b->mask.clock) ? 1 : 0;
} }
static struct i2c_adapter matrox_i2c_adapter_template = static const struct i2c_algo_bit_data matrox_i2c_algo_template =
{
.owner = THIS_MODULE,
.id = I2C_HW_B_G400,
};
static struct i2c_algo_bit_data matrox_i2c_algo_template =
{ {
.setsda = matroxfb_gpio_setsda, .setsda = matroxfb_gpio_setsda,
.setscl = matroxfb_gpio_setscl, .setscl = matroxfb_gpio_setscl,
...@@ -112,7 +106,8 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo, ...@@ -112,7 +106,8 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
b->minfo = minfo; b->minfo = minfo;
b->mask.data = data; b->mask.data = data;
b->mask.clock = clock; b->mask.clock = clock;
b->adapter = matrox_i2c_adapter_template; b->adapter.owner = THIS_MODULE;
b->adapter.id = I2C_HW_B_G400;
snprintf(b->adapter.name, sizeof(b->adapter.name), name, snprintf(b->adapter.name, sizeof(b->adapter.name), name,
minfo->fbcon.node); minfo->fbcon.node);
i2c_set_adapdata(&b->adapter, b); i2c_set_adapdata(&b->adapter, b);
......
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