Merge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[pandora-kernel.git] / include / linux / i2c.h

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index f04b1fc..be35332 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -178,13 +178,6 @@ static inline void i2c_set_clientdata (struct i2c_client *dev, void *data)
        dev_set_drvdata (&dev->dev, data);
 }
 
-#define I2C_DEVNAME(str)       .name = str
-
-static inline char *i2c_clientname(struct i2c_client *c)
-{
-       return &c->name[0];
-}
-
 /*
  * The following structs are for those who like to implement new bus drivers:
  * i2c_algorithm is the interface to a class of hardware solutions which can
@@ -192,8 +185,6 @@ static inline char *i2c_clientname(struct i2c_client *c)
  * to name two of the most common.
  */
 struct i2c_algorithm {
-       unsigned int id;
-
        /* If an adapter algorithm can't do I2C-level access, set master_xfer
           to NULL. If an adapter algorithm can do SMBus access, set 
           smbus_xfer. If set to NULL, the SMBus protocol is simulated
@@ -221,8 +212,7 @@ struct i2c_algorithm {
  */
 struct i2c_adapter {
        struct module *owner;
-       unsigned int id;/* == is algo->id | hwdep.struct->id,           */
-                       /* for registered values see below              */
+       unsigned int id;
        unsigned int class;
        struct i2c_algorithm *algo;/* the algorithm to access the bus   */
        void *algo_data;
@@ -518,9 +508,6 @@ union i2c_smbus_data {
 #define I2C_FUNCS      0x0705  /* Get the adapter functionality */
 #define I2C_RDWR       0x0707  /* Combined R/W transfer (one stop only)*/
 #define I2C_PEC                0x0708  /* != 0 for SMBus PEC                   */
-#if 0
-#define I2C_ACK_TEST   0x0710  /* See if a slave is at a specific address */
-#endif
 
 #define I2C_SMBUS      0x0720  /* SMBus-level access */