[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 <laurent.riffard@free.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/sound/oss/dmasound/dac3550a.c b/sound/oss/dmasound/dac3550a.c
index 3402a663d07fb46abe5eb6112641db9c3294272d..835e0cfc3bf34017f736e25f5e20ac092d451e03 100644 (file)
--- 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 7e3d517af4b9acf285a40298a0967dcf2f96a0ef..bd6910af286c9672adebd33fbcbac5130918c682 100644 (file)
--- 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,
 };