[PATCH] RTC subsystem: I2C cleanup

This patch, completely optional, removes from drivers/i2c/chips all the
drivers that are implemented in the new RTC subsystem.

It should be noted that none of the current driver is actually integrated,
i.e.  usable without further patches.

Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

6 files changed, 0 insertions, 1212 deletions

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index f9fae28f5612..7aa5c38f0855 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -65,15 +65,6 @@ config SENSORS_PCF8591
           This driver can also be built as a module.  If so, the module
           will be called pcf8591.
 
-config SENSORS_RTC8564
-        tristate "Epson 8564 RTC chip"
-        depends on I2C && EXPERIMENTAL
-        help
-          If you say yes here you get support for the Epson 8564 RTC chip.
-
-          This driver can also be built as a module.  If so, the module
-          will be called i2c-rtc8564.
-
 config ISP1301_OMAP
         tristate "Philips ISP1301 with OMAP OTG"
         depends on I2C && ARCH_OMAP_OTG
@@ -126,13 +117,4 @@ config SENSORS_MAX6875
           This driver can also be built as a module.  If so, the module
           will be called max6875.
 
-config RTC_X1205_I2C
-        tristate "Xicor X1205 RTC chip"
-        depends on I2C && EXPERIMENTAL
-        help
-          If you say yes here you get support for the Xicor X1205 RTC chip.
-
-          This driver can also be built as a module. If so, the module
-          will be called x1205.
-
 endmenu
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 46178b57b1f1..779868ef2e26 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -10,10 +10,8 @@ obj-$(CONFIG_SENSORS_M41T00)	+= m41t00.o
 obj-$(CONFIG_SENSORS_PCA9539)   += pca9539.o
 obj-$(CONFIG_SENSORS_PCF8574)   += pcf8574.o
 obj-$(CONFIG_SENSORS_PCF8591)   += pcf8591.o
-obj-$(CONFIG_SENSORS_RTC8564)   += rtc8564.o
 obj-$(CONFIG_ISP1301_OMAP)      += isp1301_omap.o
 obj-$(CONFIG_TPS65010)          += tps65010.o
-obj-$(CONFIG_RTC_X1205_I2C)     += x1205.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
 EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
deleted file mode 100644
index 0d8699b3f488..000000000000
--- a/drivers/i2c/chips/rtc8564.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- *  linux/drivers/i2c/chips/rtc8564.c
- *
- *  Copyright (C) 2002-2004 Stefan Eletzhofer
- *
- *      based on linux/drivers/acron/char/pcf8583.c
- *  Copyright (C) 2000 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Driver for system3's EPSON RTC 8564 chip
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/bcd.h>
-#include <linux/i2c.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/rtc.h>          /* get the user-level API */
-#include <linux/init.h>
-
-#include "rtc8564.h"
-
-#ifdef DEBUG
-# define _DBG(x, fmt, args...) do{ if (debug>=x) printk(KERN_DEBUG"%s: " fmt "\n", __FUNCTION__, ##args); } while(0);
-#else
-# define _DBG(x, fmt, args...) do { } while(0);
-#endif
-
-#define _DBGRTCTM(x, rtctm) if (debug>=x) printk("%s: secs=%d, mins=%d, hours=%d, mday=%d, " \
-                        "mon=%d, year=%d, wday=%d VL=%d\n", __FUNCTION__, \
-                        (rtctm).secs, (rtctm).mins, (rtctm).hours, (rtctm).mday, \
-                        (rtctm).mon, (rtctm).year, (rtctm).wday, (rtctm).vl);
-
-struct rtc8564_data {
-        struct i2c_client client;
-        u16 ctrl;
-};
-
-static inline u8 _rtc8564_ctrl1(struct i2c_client *client)
-{
-        struct rtc8564_data *data = i2c_get_clientdata(client);
-        return data->ctrl & 0xff;
-}
-static inline u8 _rtc8564_ctrl2(struct i2c_client *client)
-{
-        struct rtc8564_data *data = i2c_get_clientdata(client);
-        return (data->ctrl & 0xff00) >> 8;
-}
-
-#define CTRL1(c) _rtc8564_ctrl1(c)
-#define CTRL2(c) _rtc8564_ctrl2(c)
-
-static int debug;
-module_param(debug, int, S_IRUGO | S_IWUSR);
-
-static struct i2c_driver rtc8564_driver;
-
-static unsigned short ignore[] = { I2C_CLIENT_END };
-static unsigned short normal_addr[] = { 0x51, I2C_CLIENT_END };
-
-static struct i2c_client_address_data addr_data = {
-        .normal_i2c             = normal_addr,
-        .probe                  = ignore,
-        .ignore                 = ignore,
-};
-
-static int rtc8564_read_mem(struct i2c_client *client, struct mem *mem);
-static int rtc8564_write_mem(struct i2c_client *client, struct mem *mem);
-
-static int rtc8564_read(struct i2c_client *client, unsigned char adr,
-                        unsigned char *buf, unsigned char len)
-{
-        int ret = -EIO;
-        unsigned char addr[1] = { adr };
-        struct i2c_msg msgs[2] = {
-                {client->addr, 0, 1, addr},
-                {client->addr, I2C_M_RD, len, buf}
-        };
-
-        _DBG(1, "client=%p, adr=%d, buf=%p, len=%d", client, adr, buf, len);
-
-        if (!buf) {
-                ret = -EINVAL;
-                goto done;
-        }
-
-        ret = i2c_transfer(client->adapter, msgs, 2);
-        if (ret == 2) {
-                ret = 0;
-        }
-
-done:
-        return ret;
-}
-
-static int rtc8564_write(struct i2c_client *client, unsigned char adr,
-                         unsigned char *data, unsigned char len)
-{
-        int ret = 0;
-        unsigned char _data[16];
-        struct i2c_msg wr;
-        int i;
-
-        if (!data || len > 15) {
-                ret = -EINVAL;
-                goto done;
-        }
-
-        _DBG(1, "client=%p, adr=%d, buf=%p, len=%d", client, adr, data, len);
-
-        _data[0] = adr;
-        for (i = 0; i < len; i++) {
-                _data[i + 1] = data[i];
-                _DBG(5, "data[%d] = 0x%02x (%d)", i, data[i], data[i]);
-        }
-
-        wr.addr = client->addr;
-        wr.flags = 0;
-        wr.len = len + 1;
-        wr.buf = _data;
-
-        ret = i2c_transfer(client->adapter, &wr, 1);
-        if (ret == 1) {
-                ret = 0;
-        }
-
-done:
-        return ret;
-}
-
-static int rtc8564_attach(struct i2c_adapter *adap, int addr, int kind)
-{
-        int ret;
-        struct i2c_client *new_client;
-        struct rtc8564_data *d;