Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Use snprintf to set adapter names
  Input: apanel - convert to new i2c binding
  i2c: Drop I2C_CLASS_CAM_DIGITAL
  i2c: Drop I2C_CLASS_CAM_ANALOG and I2C_CLASS_SOUND
  i2c: Drop I2C_CLASS_ALL
  i2c: Get rid of remaining bus_id access
  i2c: Replace bus_id with dev_name(), dev_set_name()

diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index fc3e5b026423d8e7ab752c73a93a2e18d1e975b5..dd9e796fad698a18a011f70ef393d05e4d2d096e 100644 (file)
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -399,8 +399,8 @@ static int __devinit ali1563_probe(struct pci_dev * dev,
        if ((error = ali1563_setup(dev)))
                goto exit;
        ali1563_adapter.dev.parent = &dev->dev;
-       sprintf(ali1563_adapter.name,"SMBus ALi 1563 Adapter @ %04x",
-               ali1563_smba);
+       snprintf(ali1563_adapter.name, sizeof(ali1563_adapter.name),
+                "SMBus ALi 1563 Adapter @ %04x", ali1563_smba);
        if ((error = i2c_add_adapter(&ali1563_adapter)))
                goto exit_shutdown;
        return 0;

diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
index 8ba2bcf727d31a3ed725a2a9a0baf5a506046da8..378fcb5d5783fdaa0f724c1bdf3ebd07daa6f2a5 100644 (file)
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
@@ -197,8 +197,8 @@ static int __init amd756_s4882_init(void)
        for (i = 1; i < 5; i++) {
                s4882_algo[i] = *(amd756_smbus.algo);
                s4882_adapter[i] = amd756_smbus;
-               sprintf(s4882_adapter[i].name,
-                       "SMBus 8111 adapter (CPU%d)", i-1);
+               snprintf(s4882_adapter[i].name, sizeof(s4882_adapter[i].name),
+                        "SMBus 8111 adapter (CPU%d)", i-1);
                s4882_adapter[i].algo = s4882_algo+i;
                s4882_adapter[i].dev.parent = amd756_smbus.dev.parent;
        }

diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 424dad6f18d83a13488cfb0b8653db8631859ea1..36bee5b9c9525a7e80b13ac9fac6edba9ca60f56 100644 (file)
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -380,8 +380,9 @@ static int __devinit amd756_probe(struct pci_dev *pdev,
        /* set up the sysfs linkage to our parent device */
        amd756_smbus.dev.parent = &pdev->dev;
 
-       sprintf(amd756_smbus.name, "SMBus %s adapter at %04x",
-               chipname[id->driver_data], amd756_ioport);
+       snprintf(amd756_smbus.name, sizeof(amd756_smbus.name),
+                "SMBus %s adapter at %04x", chipname[id->driver_data],
+                amd756_ioport);
 
        error = i2c_add_adapter(&amd756_smbus);
        if (error) {

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 9efb02137254b61391efa5f30a3b155b6c68998d..67d9dc5b351b57e96d41f97f1d53da5f9c7fc9a1 100644 (file)
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -222,7 +222,7 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev)
                rc = -ENOMEM;
                goto fail2;
        }
-       sprintf(adapter->name, "AT91");
+       snprintf(adapter->name, sizeof(adapter->name), "AT91");
        adapter->algo = &at91_algorithm;
        adapter->class = I2C_CLASS_HWMON;
        adapter->dev.parent = &pdev->dev;

diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 3c855ff2992f0ad513500c9820b6e0a03eaa0719..3fd2c417c1e03faafcef50f8aee5b785ba93a477 100644 (file)
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -656,7 +656,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
        strlcpy(p_adap->name, pdev->name, sizeof(p_adap->name));
        p_adap->algo = &bfin_twi_algorithm;
        p_adap->algo_data = iface;
-       p_adap->class = I2C_CLASS_ALL;
+       p_adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
        p_adap->dev.parent = &pdev->dev;
 
        rc = peripheral_request_list(pin_req[pdev->id], "i2c-bfin-twi");

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 5123eb69a971b22e267d5de0213276c93eee3a1c..526625eaa84b6e5bede9495638b0a108e122c13e 100644 (file)
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -64,7 +64,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 /* I801 SMBus address offsets */
 #define SMBHSTSTS      (0 + i801_smba)
@@ -583,6 +583,40 @@ static struct pci_device_id i801_ids[] = {
 
 MODULE_DEVICE_TABLE (pci, i801_ids);
 
+#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE
+static unsigned char apanel_addr;
+
+/* Scan the system ROM for the signature "FJKEYINF" */
+static __init const void __iomem *bios_signature(const void __iomem *bios)
+{
+       ssize_t offset;
+       const unsigned char signature[] = "FJKEYINF";
+
+       for (offset = 0; offset < 0x10000; offset += 0x10) {
+               if (check_signature(bios + offset, signature,
+                                   sizeof(signature)-1))
+                       return bios + offset;
+       }
+       return NULL;
+}
+
+static void __init input_apanel_init(void)
+{
+       void __iomem *bios;
+       const void __iomem *p;
+
+       bios = ioremap(0xF0000, 0x10000); /* Can't fail */
+       p = bios_signature(bios);
+       if (p) {
+               /* just use the first address */
+               apanel_addr = readb(p + 8 + 3) >> 1;
+       }
+       iounmap(bios);
+}
+#else
+static void __init input_apanel_init(void) {}
+#endif
+
 static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
        unsigned char temp;
@@ -667,6 +701,19 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
                dev_err(&dev->dev, "Failed to add SMBus adapter\n");
                goto exit_release;
        }
+
+       /* Register optional slaves */
+#if defined CONFIG_INPUT_APANEL || defined CONFIG_INPUT_APANEL_MODULE
+       if (apanel_addr) {
+               struct i2c_board_info info;
+
+               memset(&info, 0, sizeof(struct i2c_board_info));
+               info.addr = apanel_addr;
+               strlcpy(info.type, "fujitsu_apanel", I2C_NAME_SIZE);
+               i2c_new_device(&i801_adapter, &info);
+       }
+#endif
+
        return 0;
 
 exit_release:
@@ -717,6 +764,7 @@ static struct pci_driver i801_driver = {
 
 static int __init i2c_i801_init(void)
 {
+       input_apanel_init();
        return pci_register_driver(&i801_driver);
 }
 

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 587f5b2380d473677360fb187919ff65358e5bbd..6af68146c34248507c0d8df07691992c31d54991 100644 (file)
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1076,10 +1076,10 @@ static int i2c_pxa_probe(struct platform_device *dev)
 
 #ifdef CONFIG_I2C_PXA_SLAVE
        printk(KERN_INFO "I2C: %s: PXA I2C adapter, slave address %d\n",
-              i2c->adap.dev.bus_id, i2c->slave_addr);
+              dev_name(&i2c->adap.dev), i2c->slave_addr);
 #else
        printk(KERN_INFO "I2C: %s: PXA I2C adapter\n",
-              i2c->adap.dev.bus_id);
+              dev_name(&i2c->adap.dev));
 #endif
        return 0;
 

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index f69f91ffb469a6f110227a8f4eee410c6e85501f..5b7f95641ba48119d17fe71c7fc02b8c3b16fd2d 100644 (file)
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -906,7 +906,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, i2c);
 
-       dev_info(&pdev->dev, "%s: S3C I2C adapter\n", i2c->adap.dev.bus_id);
+       dev_info(&pdev->dev, "%s: S3C I2C adapter\n", dev_name(&i2c->adap.dev));
        return 0;
 
  err_cpufreq:

diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index 5e0e254976de47735a2e797721133e6bf82554c8..baa28b73ae423492412192bdf7b1b203bdf89905 100644 (file)
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -475,7 +475,7 @@ static int __devinit sh7760_i2c_probe(struct platform_device *pdev)
 
        id->adap.nr = pdev->id;
        id->adap.algo = &sh7760_i2c_algo;
-       id->adap.class = I2C_CLASS_ALL;
+       id->adap.class = I2C_CLASS_HWMON | I2C_CLASS_SPD;
        id->adap.retries = 3;
        id->adap.algo_data = id;
        id->adap.dev.parent = &pdev->dev;

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 6c3d60b939bf20dbe47f8d4b2db13d1cbff68dc5..1c01083b01b5ac0bc3f7eac54a657a72fb049ea0 100644 (file)
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -500,7 +500,7 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook)
        while ((res = platform_get_resource(dev, IORESOURCE_IRQ, k))) {
                for (n = res->start; hook && n <= res->end; n++) {
                        if (request_irq(n, sh_mobile_i2c_isr, IRQF_DISABLED,
-                                       dev->dev.bus_id, dev))
+                                       dev_name(&dev->dev), dev))
                                goto rollback;
                }
                k++;

diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index dfc2d5eb6a6895f437abcbb7f19ada78f815e618..8ce2daff985c5a4c016d2b7325c09e45277d3509 100644 (file)
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -389,8 +389,8 @@ static int __devinit sis5595_probe(struct pci_dev *dev, const struct pci_device_
        /* set up the sysfs linkage to our parent device */
        sis5595_adapter.dev.parent = &dev->dev;
 
-       sprintf(sis5595_adapter.name, "SMBus SIS5595 adapter at %04x",
-               sis5595_base + SMB_INDEX);
+       snprintf(sis5595_adapter.name, sizeof(sis5595_adapter.name),
+                "SMBus SIS5595 adapter at %04x", sis5595_base + SMB_INDEX);
        err = i2c_add_adapter(&sis5595_adapter);
        if (err) {
                release_region(sis5595_base + SMB_INDEX, 2);

diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index e7c4b790da5427393783405f6da6271b120efd64..9c9c016ff2b51e7a12066b3161c3f6bbd1b5041d 100644 (file)
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -487,8 +487,8 @@ static int __devinit sis630_probe(struct pci_dev *dev, const struct pci_device_i
        /* set up the sysfs linkage to our parent device */
        sis630_adapter.dev.parent = &dev->dev;
 
-       sprintf(sis630_adapter.name, "SMBus SIS630 adapter at %04x",
-               acpi_base + SMB_STS);
+       snprintf(sis630_adapter.name, sizeof(sis630_adapter.name),
+                "SMBus SIS630 adapter at %04x", acpi_base + SMB_STS);
 
        return i2c_add_adapter(&sis630_adapter);
 }

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index c6a63f46bc152796dbea5c5a930c44eed595f476..b1c9abe24c7b2a84f143c264d82a3ee74cdc0639 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -459,7 +459,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
                pr_debug("I2C adapter driver [%s] forgot to specify "
                         "physical device\n", adap->name);
        }
-       sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
+       dev_set_name(&adap->dev, "i2c-%d", adap->nr);
        adap->dev.release = &i2c_adapter_dev_release;
        adap->dev.class = &i2c_adapter_class;
        res = device_register(&adap->dev);
@@ -845,8 +845,8 @@ int i2c_attach_client(struct i2c_client *client)
        } else
                client->dev.release = i2c_client_dev_release;
 
-       snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
-               "%d-%04x", i2c_adapter_id(adapter), client->addr);
+       dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adapter),
+                    client->addr);
        res = device_register(&client->dev);
        if (res)
                goto out_err;
@@ -856,7 +856,7 @@ int i2c_attach_client(struct i2c_client *client)
        mutex_unlock(&adapter->clist_lock);
 
        dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
-               client->name, client->dev.bus_id);
+               client->name, dev_name(&client->dev));
 
        if (adapter->client_register)  {
                if (adapter->client_register(client)) {

diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c
index d82f7f727f7a2e0897d6a564afb2e51238e281af..71b82434264d1c3efde2a1f0f0bc187b3ead3b5e 100644 (file)
--- a/drivers/input/misc/apanel.c
+++ b/drivers/input/misc/apanel.c
@@ -57,7 +57,7 @@ static enum apanel_chip device_chip[APANEL_DEV_MAX];
 
 struct apanel {
        struct input_polled_dev *ipdev;
-       struct i2c_client client;
+       struct i2c_client *client;
        unsigned short keymap[MAX_PANEL_KEYS];
        u16    nkeys;
        u16    led_bits;
@@ -66,16 +66,7 @@ struct apanel {
 };
 
 
-static int apanel_probe(struct i2c_adapter *, int, int);
-
-/* for now, we only support one address */
-static unsigned short normal_i2c[] = {0, I2C_CLIENT_END};
-static unsigned short ignore = I2C_CLIENT_END;
-static struct i2c_client_address_data addr_data = {
-       .normal_i2c     = normal_i2c,
-       .probe          = &ignore,
-       .ignore         = &ignore,
-};
+static int apanel_probe(struct i2c_client *, const struct i2c_device_id *);
 
 static void report_key(struct input_dev *input, unsigned keycode)
 {
@@ -103,12 +94,12 @@ static void apanel_poll(struct input_polled_dev *ipdev)
        s32 data;
        int i;
 
-       data = i2c_smbus_read_word_data(&ap->client, cmd);
+       data = i2c_smbus_read_word_data(ap->client, cmd);
        if (data < 0)
                return; /* ignore errors (due to ACPI??) */
 
        /* write back to clear latch */
-       i2c_smbus_write_word_data(&ap->client, cmd, 0);
+       i2c_smbus_write_word_data(ap->client, cmd, 0);
 
        if (!data)
                return;
@@ -124,7 +115,7 @@ static void led_update(struct work_struct *work)
 {
        struct apanel *ap = container_of(work, struct apanel, led_work);
 
-       i2c_smbus_write_word_data(&ap->client, 0x10, ap->led_bits);
+       i2c_smbus_write_word_data(ap->client, 0x10, ap->led_bits);
 }
 
 static void mail_led_set(struct led_classdev *led,
@@ -140,7 +131,7 @@ static void mail_led_set(struct led_classdev *led,
        schedule_work(&ap->led_work);
 }
 
-static int apanel_detach_client(struct i2c_client *client)
+static int apanel_remove(struct i2c_client *client)
 {
        struct apanel *ap = i2c_get_clientdata(client);
 
@@ -148,43 +139,33 @@ static int apanel_detach_client(struct i2c_client *client)
                led_classdev_unregister(&ap->mail_led);
 
        input_unregister_polled_device(ap->ipdev);
-       i2c_detach_client(&ap->client);
        input_free_polled_device(ap->ipdev);
 
        return 0;
 }
 
-/* Function is invoked for every i2c adapter. */
-static int apanel_attach_adapter(struct i2c_adapter *adap)
-{
-       dev_dbg(&adap->dev, APANEL ": attach adapter id=%d\n", adap->id);
-
-       /* Our device is connected only to i801 on laptop */
-       if (adap->id != I2C_HW_SMBUS_I801)
-               return -ENODEV;
-
-       return i2c_probe(adap, &addr_data, apanel_probe);
-}
-
 static void apanel_shutdown(struct i2c_client *client)
 {
-       apanel_detach_client(client);
+       apanel_remove(client);
 }
 
+static struct i2c_device_id apanel_id[] = {
+       { "fujitsu_apanel", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, apanel_id);
+
 static struct i2c_driver apanel_driver = {
        .driver = {
                .name = APANEL,
        },
-       .attach_adapter = &apanel_attach_adapter,
-       .detach_client  = &apanel_detach_client,
+       .probe          = &apanel_probe,
+       .remove         = &apanel_remove,
        .shutdown       = &apanel_shutdown,
+       .id_table       = apanel_id,
 };
 
 static struct apanel apanel = {
-       .client = {
-               .driver = &apanel_driver,
-               .name   = APANEL,
-       },
        .keymap = {
                [0] = KEY_MAIL,
                [1] = KEY_WWW,
@@ -204,7 +185,8 @@ static struct apanel apanel = {
 };
 
 /* NB: Only one panel on the i2c. */
-static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
+static int apanel_probe(struct i2c_client *client,
+                       const struct i2c_device_id *id)
 {
        struct apanel *ap;
        struct input_polled_dev *ipdev;
@@ -212,9 +194,6 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
        u8 cmd = device_chip[APANEL_DEV_APPBTN] == CHIP_OZ992C ? 0 : 8;
        int i, err = -ENOMEM;
 
-       dev_dbg(&bus->dev, APANEL ": probe adapter %p addr %d kind %d\n",
-               bus, address, kind);
-
        ap = &apanel;
 
        ipdev = input_allocate_polled_device();
@@ -222,18 +201,13 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
                goto out1;
 
        ap->ipdev = ipdev;
-       ap->client.adapter = bus;
-       ap->client.addr = address;
-
-       i2c_set_clientdata(&ap->client, ap);
+       ap->client = client;
 
-       err = i2c_attach_client(&ap->client);
-       if (err)
-               goto out2;
+       i2c_set_clientdata(client, ap);
 
-       err = i2c_smbus_write_word_data(&ap->client, cmd, 0);
+       err = i2c_smbus_write_word_data(client, cmd, 0);
        if (err) {
-               dev_warn(&ap->client.dev, APANEL ": smbus write error %d\n",
+               dev_warn(&client->dev, APANEL ": smbus write error %d\n",
                         err);
                goto out3;
        }
@@ -246,7 +220,7 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
        idev->name = APANEL_NAME " buttons";
        idev->phys = "apanel/input0";
        idev->id.bustype = BUS_HOST;
-       idev->dev.parent = &ap->client.dev;
+       idev->dev.parent = &client->dev;
 
        set_bit(EV_KEY, idev->evbit);
 
@@ -264,7 +238,7 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
 
        INIT_WORK(&ap->led_work, led_update);
        if (device_chip[APANEL_DEV_LED] != CHIP_NONE) {
-               err = led_classdev_register(&ap->client.dev, &ap->mail_led);
+               err = led_classdev_register(&client->dev, &ap->mail_led);
                if (err)
                        goto out4;
        }
@@ -273,8 +247,6 @@ static int apanel_probe(struct i2c_adapter *bus, int address, int kind)
 out4:
        input_unregister_polled_device(ipdev);
 out3:
-       i2c_detach_client(&ap->client);
-out2:
        input_free_polled_device(ipdev);
 out1:
        return err;
@@ -301,6 +273,7 @@ static int __init apanel_init(void)
        void __iomem *bios;
        const void __iomem *p;
        u8 devno;
+       unsigned char i2c_addr;
        int found = 0;
 
        bios = ioremap(0xF0000, 0x10000); /* Can't fail */
@@ -313,7 +286,7 @@ static int __init apanel_init(void)
 
        /* just use the first address */
        p += 8;
-       normal_i2c[0] = readb(p+3) >> 1;
+       i2c_addr = readb(p + 3) >> 1;
 
        for ( ; (devno = readb(p)) & 0x7f; p += 4) {
                unsigned char method, slave, chip;
@@ -322,7 +295,7 @@ static int __init apanel_init(void)
                chip = readb(p + 2);
                slave = readb(p + 3) >> 1;
 
-               if (slave != normal_i2c[0]) {
+               if (slave != i2c_addr) {
                        pr_notice(APANEL ": only one SMBus slave "
                                  "address supported, skiping device...\n");
                        continue;

diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 34a39d2e4703843bc7a0dfd2dc9431f5de149907..46fd573a4f1511594213c01525d10fb5a9f64b04 100644 (file)
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -569,7 +569,6 @@ static int cafe_smbus_setup(struct cafe_camera *cam)
 
        cafe_smbus_enable_irq(cam);
        adap->id = I2C_HW_SMBUS_CAFE;
-       adap->class = I2C_CLASS_CAM_DIGITAL;
        adap->owner = THIS_MODULE;
        adap->client_register = cafe_smbus_attach;
        adap->client_unregister = cafe_smbus_detach;

diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index ca26b0c50cf2ab94095e0856f1183974fba3a918..05c14a29375ae6f921899b0ce28db21f218c39c0 100644 (file)
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -1347,7 +1347,6 @@ static struct i2c_driver ov7670_driver = {
                .name = "ov7670",
        },
        .id             = I2C_DRIVERID_OV7670,
-       .class          = I2C_CLASS_CAM_DIGITAL,
        .attach_adapter = ov7670_attach,
        .detach_client  = ov7670_detach,
        .command        = ov7670_command,

diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 2c4acbf5a4feae2f5f425c8d9f8b925ec4cdcbd9..c841f4e4fbe4903d45f1877e982c9aaebda7e73e 100644 (file)
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -405,7 +405,6 @@ static struct i2c_driver driver = {
                .name =         "ovcamchip",
        },
        .id =                   I2C_DRIVERID_OVCAMCHIP,
-       .class =                I2C_CLASS_CAM_DIGITAL,
        .attach_adapter =       ovcamchip_attach,
        .detach_client =        ovcamchip_detach,
        .command =              ovcamchip_command,

diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c
index a3997b7d4366049d9ce20e446e67fb47f0bececf..105a832531f2529a61a6c45cbb0855f79b514bfa 100644 (file)
--- a/drivers/media/video/w9968cf.c
+++ b/drivers/media/video/w9968cf.c
@@ -1553,7 +1553,6 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
 
        static struct i2c_adapter adap = {
                .id =                I2C_HW_SMBUS_W9968CF,
-               .class =             I2C_CLASS_CAM_DIGITAL,
                .owner =             THIS_MODULE,
                .client_register =   w9968cf_i2c_attach_inform,
                .client_unregister = w9968cf_i2c_detach_inform,

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 33a5992d493651383e00832b13b69f396d77bfff..20873d402467c6dea8d5425092b945f78e9ea31b 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -393,11 +393,7 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
 #define I2C_CLASS_TV_ANALOG    (1<<1)  /* bttv + friends */
 #define I2C_CLASS_TV_DIGITAL   (1<<2)  /* dvb cards */
 #define I2C_CLASS_DDC          (1<<3)  /* DDC bus on graphics adapters */
-#define I2C_CLASS_CAM_ANALOG   (1<<4)  /* camera with analog CCD */
-#define I2C_CLASS_CAM_DIGITAL  (1<<5)  /* most webcams */
-#define I2C_CLASS_SOUND                (1<<6)  /* sound devices */
 #define I2C_CLASS_SPD          (1<<7)  /* SPD EEPROMs and similar */
-#define I2C_CLASS_ALL          (UINT_MAX) /* all of the above */
 
 /* i2c_client_address_data is the struct for holding default client
  * addresses for a driver and for the parameters supplied on the