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: Delete unused i2c-algo-sgi helper module
  i2c: Delete many unused driver IDs
  i2c: Deprecate client_register and client_unregister methods

7 files changed, 4 insertions, 250 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 39246fc11257..7e2af10e8264 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -354,7 +354,8 @@ Who:  Krzysztof Piotr Oledzki <ole@ans.pl>
 
 ---------------------------
 
-What:   i2c_attach_client(), i2c_detach_client(), i2c_driver->detach_client()
+What:   i2c_attach_client(), i2c_detach_client(), i2c_driver->detach_client(),
+        i2c_adapter->client_register(), i2c_adapter->client_unregister
 When:   2.6.30
 Check:  i2c_attach_client i2c_detach_client
 Why:    Deprecated by the new (standard) device driver binding model. Use
diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig
index b788579b8227..7b2ce4a08524 100644
--- a/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
@@ -14,8 +14,4 @@ config I2C_ALGOPCF
 config I2C_ALGOPCA
         tristate "I2C PCA 9564 interfaces"
 
-config I2C_ALGO_SGI
-        tristate
-        depends on SGI_IP22 || SGI_IP32 || X86_VISWS
-
 endmenu
diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
index cac1051bd4f1..18b3e962ec09 100644
--- a/drivers/i2c/algos/Makefile
+++ b/drivers/i2c/algos/Makefile
@@ -5,7 +5,6 @@
 obj-$(CONFIG_I2C_ALGOBIT)       += i2c-algo-bit.o
 obj-$(CONFIG_I2C_ALGOPCF)       += i2c-algo-pcf.o
 obj-$(CONFIG_I2C_ALGOPCA)       += i2c-algo-pca.o
-obj-$(CONFIG_I2C_ALGO_SGI)      += i2c-algo-sgi.o
 
 ifeq ($(CONFIG_I2C_DEBUG_ALGO),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c
deleted file mode 100644
index 6eaf145e1ada..000000000000
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * i2c-algo-sgi.c: i2c driver algorithm used by the VINO (SGI Indy) and
- * MACE (SGI O2) chips.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License version 2 as published by the Free Software Foundation.
- *
- * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-
-#include <linux/i2c.h>
-#include <linux/i2c-algo-sgi.h>
-
-
-#define SGI_I2C_FORCE_IDLE      (0 << 0)
-#define SGI_I2C_NOT_IDLE        (1 << 0)
-#define SGI_I2C_WRITE           (0 << 1)
-#define SGI_I2C_READ            (1 << 1)
-#define SGI_I2C_RELEASE_BUS     (0 << 2)
-#define SGI_I2C_HOLD_BUS        (1 << 2)
-#define SGI_I2C_XFER_DONE       (0 << 4)
-#define SGI_I2C_XFER_BUSY       (1 << 4)
-#define SGI_I2C_ACK             (0 << 5)
-#define SGI_I2C_NACK            (1 << 5)
-#define SGI_I2C_BUS_OK          (0 << 7)
-#define SGI_I2C_BUS_ERR         (1 << 7)
-
-#define get_control()           adap->getctrl(adap->data)
-#define set_control(val)        adap->setctrl(adap->data, val)
-#define read_data()             adap->rdata(adap->data)
-#define write_data(val)         adap->wdata(adap->data, val)
-
-
-static int wait_xfer_done(struct i2c_algo_sgi_data *adap)
-{
-        int i;
-
-        for (i = 0; i < adap->xfer_timeout; i++) {
-                if ((get_control() & SGI_I2C_XFER_BUSY) == 0)
-                        return 0;
-                udelay(1);
-        }
-
-        return -ETIMEDOUT;
-}
-
-static int wait_ack(struct i2c_algo_sgi_data *adap)
-{
-        int i;
-
-        if (wait_xfer_done(adap))
-                return -ETIMEDOUT;
-        for (i = 0; i < adap->ack_timeout; i++) {
-                if ((get_control() & SGI_I2C_NACK) == 0)
-                        return 0;
-                udelay(1);
-        }
-
-        return -ETIMEDOUT;
-}
-
-static int force_idle(struct i2c_algo_sgi_data *adap)
-{
-        int i;
-
-        set_control(SGI_I2C_FORCE_IDLE);
-        for (i = 0; i < adap->xfer_timeout; i++) {
-                if ((get_control() & SGI_I2C_NOT_IDLE) == 0)
-                        goto out;
-                udelay(1);
-        }
-        return -ETIMEDOUT;
-out:
-        if (get_control() & SGI_I2C_BUS_ERR)
-                return -EIO;
-        return 0;
-}
-
-static int do_address(struct i2c_algo_sgi_data *adap, unsigned int addr,
-                      int rd)
-{
-        if (rd)
-                set_control(SGI_I2C_NOT_IDLE);
-        /* Check if bus is idle, eventually force it to do so */
-        if (get_control() & SGI_I2C_NOT_IDLE)
-                if (force_idle(adap))
-                        return -EIO;
-        /* Write out the i2c chip address and specify operation */
-        set_control(SGI_I2C_HOLD_BUS | SGI_I2C_WRITE | SGI_I2C_NOT_IDLE);
-        if (rd)
-                addr |= 1;
-        write_data(addr);
-        if (wait_ack(adap))
-                return -EIO;
-        return 0;
-}
-
-static int i2c_read(struct i2c_algo_sgi_data *adap, unsigned char *buf,
-                    unsigned int len)
-{
-        int i;
-
-        set_control(SGI_I2C_HOLD_BUS | SGI_I2C_READ | SGI_I2C_NOT_IDLE);
-        for (i = 0; i < len; i++) {
-                if (wait_xfer_done(adap))
-                        return -EIO;
-                buf[i] = read_data();
-        }
-        set_control(SGI_I2C_RELEASE_BUS | SGI_I2C_FORCE_IDLE);
-
-        return 0;
-
-}
-
-static int i2c_write(struct i2c_algo_sgi_data *adap, unsigned char *buf,
-                     unsigned int len)
-{
-        int i;
-
-        /* We are already in write state */
-        for (i = 0; i < len; i++) {
-                write_data(buf[i]);
-                if (wait_ack(adap))
-                        return -EIO;
-        }
-        return 0;
-}
-
-static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
-                    int num)
-{
-        struct i2c_algo_sgi_data *adap = i2c_adap->algo_data;
-        struct i2c_msg *p;
-        int i, err = 0;
-
-        for (i = 0; !err && i < num; i++) {
-                p = &msgs[i];
-                err = do_address(adap, p->addr, p->flags & I2C_M_RD);
-                if (err || !p->len)
-                        continue;
-                if (p->flags & I2C_M_RD)
-                        err = i2c_read(adap, p->buf, p->len);
-                else
-                        err = i2c_write(adap, p->buf, p->len);
-        }
-
-        return (err < 0) ? err : i;
-}
-
-static u32 sgi_func(struct i2c_adapter *adap)
-{
-        return I2C_FUNC_SMBUS_EMUL;
-}
-
-static const struct i2c_algorithm sgi_algo = {
-        .master_xfer    = sgi_xfer,
-        .functionality  = sgi_func,
-};
-
-/*
- * registering functions to load algorithms at runtime
- */
-int i2c_sgi_add_bus(struct i2c_adapter *adap)
-{
-        adap->algo = &sgi_algo;
-
-        return i2c_add_adapter(adap);
-}
-EXPORT_SYMBOL(i2c_sgi_add_bus);
-
-MODULE_AUTHOR("Ladislav Michl <ladis@linux-mips.org>");
-MODULE_DESCRIPTION("I2C-Bus SGI algorithm");
-MODULE_LICENSE("GPL");
diff --git a/include/linux/i2c-algo-sgi.h b/include/linux/i2c-algo-sgi.h
deleted file mode 100644
index 3b7715024e69..000000000000
--- a/include/linux/i2c-algo-sgi.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License version 2 as published by the Free Software Foundation.
- *
- * Copyright (C) 2003 Ladislav Michl <ladis@linux-mips.org>
- */
-
-#ifndef I2C_ALGO_SGI_H
-#define I2C_ALGO_SGI_H 1
-
-#include <linux/i2c.h>
-
-struct i2c_algo_sgi_data {
-        void *data;     /* private data for lowlevel routines */
-        unsigned (*getctrl)(void *data);
-        void (*setctrl)(void *data, unsigned val);
-        unsigned (*rdata)(void *data);
-        void (*wdata)(void *data, unsigned val);
-
-        int xfer_timeout;
-        int ack_timeout;
-};
-
-int i2c_sgi_add_bus(struct i2c_adapter *);
-
-#endif /* I2C_ALGO_SGI_H */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index f27604af8378..ee9fbc172405 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -33,47 +33,10 @@
 
 #define I2C_DRIVERID_MSP3400     1
 #define I2C_DRIVERID_TUNER       2
-#define I2C_DRIVERID_TEA6420     5      /* audio matrix switch          */
-#define I2C_DRIVERID_TEA6415C    6      /* video matrix switch          */
-#define I2C_DRIVERID_TDA9840     7      /* stereo sound processor       */
-#define I2C_DRIVERID_SAA7111A    8      /* video input processor        */
-#define I2C_DRIVERID_SAA7185B   13      /* video encoder                */
-#define I2C_DRIVERID_SAA7110    22      /* video decoder                */
-#define I2C_DRIVERID_SAA5249    24      /* SAA5249 and compatibles      */
 #define I2C_DRIVERID_TDA7432    27      /* Stereo sound processor       */
 #define I2C_DRIVERID_TVAUDIO    29      /* Generic TV sound driver      */
-#define I2C_DRIVERID_TDA9875    32      /* TV sound decoder chip        */
-#define I2C_DRIVERID_BT819      40     /* video decoder                 */
-#define I2C_DRIVERID_BT856      41     /* video encoder                 */
-#define I2C_DRIVERID_VPX3220    42     /* video decoder+vbi/vtxt        */
-#define I2C_DRIVERID_ADV7175    48     /* ADV 7175/7176 video encoder   */
-#define I2C_DRIVERID_SAA7114    49      /* video decoder                */
-#define I2C_DRIVERID_ADV7170    54      /* video encoder                */
-#define I2C_DRIVERID_SAA7191    57      /* video decoder                */
-#define I2C_DRIVERID_INDYCAM    58      /* SGI IndyCam                  */
-#define I2C_DRIVERID_OVCAMCHIP  61      /* OmniVision CMOS image sens.  */
-#define I2C_DRIVERID_SAA6752HS  67      /* MPEG2 encoder                */
-#define I2C_DRIVERID_TVEEPROM   68      /* TV EEPROM                    */
-#define I2C_DRIVERID_WM8775     69      /* wm8775 audio processor       */
-#define I2C_DRIVERID_CS53L32A   70      /* cs53l32a audio processor     */
-#define I2C_DRIVERID_CX25840    71      /* cx2584x video encoder        */
-#define I2C_DRIVERID_SAA7127    72      /* saa7127 video encoder        */
 #define I2C_DRIVERID_SAA711X    73      /* saa711x video encoders       */
 #define I2C_DRIVERID_INFRARED   75      /* I2C InfraRed on Video boards */
-#define I2C_DRIVERID_TVP5150    76      /* TVP5150 video decoder        */
-#define I2C_DRIVERID_WM8739     77      /* wm8739 audio processor       */
-#define I2C_DRIVERID_UPD64083   78      /* upd64083 video processor     */
-#define I2C_DRIVERID_UPD64031A  79      /* upd64031a video processor    */
-#define I2C_DRIVERID_SAA717X    80      /* saa717x video encoder        */
-#define I2C_DRIVERID_BT866      85      /* Conexant bt866 video encoder */
-#define I2C_DRIVERID_KS0127     86      /* Samsung ks0127 video decoder */
-#define I2C_DRIVERID_TLV320AIC23B 87    /* TI TLV320AIC23B audio codec  */
-#define I2C_DRIVERID_VP27SMPX   93      /* Panasonic VP27s tuner internal MPX */
-#define I2C_DRIVERID_M52790     95      /* Mitsubishi M52790SP/FP AV switch */
-#define I2C_DRIVERID_CS5345     96      /* cs5345 audio processor       */
-#define I2C_DRIVERID_AU8522     97      /* Auvitek au8522       */
-
-#define I2C_DRIVERID_OV7670 1048        /* Omnivision 7670 camera */
 
 /*
  * ---- Adapter types ----------------------------------------------------
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index c86c3b07604c..00ee11eb9092 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -353,8 +353,8 @@ struct i2c_adapter {
         void *algo_data;
 
         /* --- administration stuff. */
-        int (*client_register)(struct i2c_client *);
-        int (*client_unregister)(struct i2c_client *);
+        int (*client_register)(struct i2c_client *) __deprecated;
+        int (*client_unregister)(struct i2c_client *) __deprecated;
 
         /* data fields that are valid for all devices   */
         u8 level;                       /* nesting level for lockdep */