aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLaurent Riffard <laurent.riffard@free.fr>2005-11-26 14:46:32 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-06 01:16:23 -0500
commitd74cdab1cad1e5895d8928eeeb2ac469f8410d2e (patch)
tree67f0d77998c9c6bb1affbee5daf6320e07f06149 /sound
parent604f28e2b8d34cbaf08f0351374645f161335a82 (diff)
[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>
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/dmasound/dac3550a.c6
-rw-r--r--sound/oss/dmasound/tas_common.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/sound/oss/dmasound/dac3550a.c b/sound/oss/dmasound/dac3550a.c
index 3402a663d07f..835e0cfc3bf3 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);
41static int daca_detach_client(struct i2c_client *client); 41static int daca_detach_client(struct i2c_client *client);
42 42
43struct i2c_driver daca_driver = { 43struct i2c_driver daca_driver = {
44 .owner = THIS_MODULE, 44 .driver = {
45 .name = "DAC3550A driver V " DACA_VERSION, 45 .owner = THIS_MODULE,
46 .name = "DAC3550A driver V " DACA_VERSION,
47 },
46 .id = I2C_DRIVERID_DACA, 48 .id = I2C_DRIVERID_DACA,
47 .attach_adapter = daca_attach_adapter, 49 .attach_adapter = daca_attach_adapter,
48 .detach_client = daca_detach_client, 50 .detach_client = daca_detach_client,
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c
index 7e3d517af4b9..bd6910af286c 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 *);
47static int tas_detach_client(struct i2c_client *); 47static int tas_detach_client(struct i2c_client *);
48 48
49struct i2c_driver tas_driver = { 49struct i2c_driver tas_driver = {
50 .owner = THIS_MODULE, 50 .driver = {
51 .name = "tas", 51 .owner = THIS_MODULE,
52 .name = "tas",
53 },
52 .attach_adapter = tas_attach_adapter, 54 .attach_adapter = tas_attach_adapter,
53 .detach_client = tas_detach_client, 55 .detach_client = tas_detach_client,
54}; 56};