[PATCH] I2C: remove some usages of i2c_adapter.id as they are not used.

Seems i2c_adapter.id is only used in some video drivers, will work on
cleaning up that mess later...

diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index aee7d843551b0720d25c8409f10009c5a0e56a89..65782574600c6442791f2816ec26034d193494a4 100644 (file)
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -481,7 +481,6 @@ static struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter ali1535_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_ALI1535,
        .algo           = &smbus_algorithm,
        .name           = "unset",
 };

diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 1e0630ea4e571ac0e2bc71f10c1ec10d3089abd1..ffa86ad452ab48b710fb9f2d6923af9b49efcfaa 100644 (file)
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -471,7 +471,6 @@ static struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter ali15x3_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_ALI15X3,
        .class          = I2C_ADAP_CLASS_SMBUS,
        .algo           = &smbus_algorithm,
        .name           = "unset",

diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 1e3e787e2de89203e7f1ff0937819c346a3da48a..556cc3103a0b4acf072674317b7f892140ed532c 100644 (file)
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -304,7 +304,6 @@ static struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter amd756_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_AMD756,
        .class          = I2C_ADAP_CLASS_SMBUS,
        .algo           = &smbus_algorithm,
        .name           = "unset",

diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index fc194c55538d995ca0d2b9b041d51f006e0efc1f..1b36ab1704eb6f3f87e1f42a40ad3064566540ed 100644 (file)
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -358,7 +358,6 @@ static int __devinit amd8111_probe(struct pci_dev *dev, const struct pci_device_
        smbus->adapter.owner = THIS_MODULE;
        snprintf(smbus->adapter.name, I2C_NAME_SIZE,
                "SMBus2 AMD8111 adapter at %04x", smbus->base);
-       smbus->adapter.id = I2C_ALGO_SMBUS | I2C_HW_SMBUS_AMD8111;
        smbus->adapter.class = I2C_ADAP_CLASS_SMBUS;
        smbus->adapter.algo = &smbus_algorithm;
        smbus->adapter.algo_data = smbus;

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 2b47ed91c85daeedc1984808a9b1a6338fd9832b..1f07c0c358aa411b22c903ab0c88c69d4d85d150 100644 (file)
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -540,7 +540,6 @@ static struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter i801_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_I801,
        .class          = I2C_ADAP_CLASS_SMBUS,
        .algo           = &smbus_algorithm,
        .name           = "unset",

diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index bfc4fc5da694fe5a9a51f6c9fa95b629dc32e545..68dcffb6ef7c56a81081de122b48e9af928ff75c 100644 (file)
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -42,7 +42,6 @@ static struct i2c_algorithm isa_algorithm = {
 /* There can only be one... */
 static struct i2c_adapter isa_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_ALGO_ISA | I2C_HW_ISA,
        .class          = I2C_ADAP_CLASS_SMBUS,
        .algo           = &isa_algorithm,
        .name           = "ISA main adapter",

diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index a3ab0136cb3813ac7ff6053f4768841644eea336..b710d93b12b347029df50c08bb9db686651ea6d2 100644 (file)
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -118,7 +118,6 @@ static struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter nforce2_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_NFORCE2,
        .class          = I2C_ADAP_CLASS_SMBUS,
        .algo           = &smbus_algorithm,
        .name           = "unset",

diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 86b384fd3cf3a111cc3397b26c5e0215630d613b..e3ac156b7c7f61c9dc368d115301979005193f95 100644 (file)
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -395,7 +395,6 @@ static struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter piix4_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_PIIX4,
        .class          = I2C_ADAP_CLASS_SMBUS,
        .algo           = &smbus_algorithm,
        .name           = "unset",

diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 7f89230095446330882e95f09d86ea5b71b4edbd..556620b4ec5f24beafc71c2ac75a873aab911499 100644 (file)
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -261,7 +261,6 @@ static struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter sis96x_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_SIS96X,
        .class          = I2C_ADAP_CLASS_SMBUS,
        .algo           = &smbus_algorithm,
        .name           = "unset",

diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index d95f6d89cd294fbf8d3cb520c8f42fb2e0e784cb..c030fdb89a57051e41192f34d4bfb612b8e6b800 100644 (file)
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -287,7 +287,6 @@ static struct i2c_algorithm smbus_algorithm = {
 
 static struct i2c_adapter vt596_adapter = {
        .owner          = THIS_MODULE,
-       .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_VIA2,
        .class          = I2C_ADAP_CLASS_SMBUS,
        .algo           = &smbus_algorithm,
        .name           = "unset",

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index fefe6f1733d5ef84d73d61a3172919875eac9f79..d314f3928d0fb814e98b8f361d8c68240a58b674 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -581,8 +581,7 @@ int i2c_master_send(struct i2c_client *client,const char *buf ,int count)
                 */
                return (ret == 1 )? count : ret;
        } else {
-               printk(KERN_ERR "i2c-core.o: I2C adapter %04x: I2C level transfers not supported\n",
-                      client->adapter->id);
+               dev_err(&client->adapter->dev, "I2C level transfers not supported\n");
                return -ENOSYS;
        }
 }
@@ -614,8 +613,7 @@ int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
                */
                return (ret == 1 )? count : ret;
        } else {
-               printk(KERN_DEBUG "i2c-core.o: I2C adapter %04x: I2C level transfers not supported\n",
-                      client->adapter->id);
+               dev_err(&client->adapter->dev, "I2C level transfers not supported\n");
                return -ENOSYS;
        }
 }