From d74cdab1cad1e5895d8928eeeb2ac469f8410d2e Mon Sep 17 00:00:00 2001 From: Laurent Riffard Date: Sat, 26 Nov 2005 20:46:32 +0100 Subject: [PATCH] i2c: Drop i2c_driver.{owner,name}, 6 of 11 We should use the i2c_driver.driver's .name and .owner fields instead of the i2c_driver's ones. This patch updates the OSS drivers. Signed-off-by: Laurent Riffard Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- sound/oss/dmasound/dac3550a.c | 6 ++++-- sound/oss/dmasound/tas_common.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'sound/oss') diff --git a/sound/oss/dmasound/dac3550a.c b/sound/oss/dmasound/dac3550a.c index 3402a663d07..835e0cfc3bf 100644 --- a/sound/oss/dmasound/dac3550a.c +++ b/sound/oss/dmasound/dac3550a.c @@ -41,8 +41,10 @@ static int daca_detect_client(struct i2c_adapter *adapter, int address); static int daca_detach_client(struct i2c_client *client); struct i2c_driver daca_driver = { - .owner = THIS_MODULE, - .name = "DAC3550A driver V " DACA_VERSION, + .driver = { + .owner = THIS_MODULE, + .name = "DAC3550A driver V " DACA_VERSION, + }, .id = I2C_DRIVERID_DACA, .attach_adapter = daca_attach_adapter, .detach_client = daca_detach_client, diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c index 7e3d517af4b..bd6910af286 100644 --- a/sound/oss/dmasound/tas_common.c +++ b/sound/oss/dmasound/tas_common.c @@ -47,8 +47,10 @@ static int tas_attach_adapter(struct i2c_adapter *); static int tas_detach_client(struct i2c_client *); struct i2c_driver tas_driver = { - .owner = THIS_MODULE, - .name = "tas", + .driver = { + .owner = THIS_MODULE, + .name = "tas", + }, .attach_adapter = tas_attach_adapter, .detach_client = tas_detach_client, }; -- cgit v1.2.3