Skip to contentSkip to conversation

i2c-algo-sibyte: Merge into i2c-sibyte

PATCH New Greg KH 1 participant 1 message Sep 27, 2006 I2C subsystem host drivers

lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 7/30 i2c-algo-sibyte: Merge into i2c-sibyte

From: Jean Delvare <khali at linux-fr.org>

i2c-algo-sibyte: Merge into i2c-sibyte

Merge i2c-algo-sibyte into i2c-sibyte, as this is a complete, hardware-dependent SMBus implementation and not a reusable algorithm.

Perform some basic coding style cleanups while we're here (mainly space-based indentation replaced by tabulations.)

Signed-off-by Jean Delvare <khali at linux-fr.org>
Cc Ralf Baechle <ralf at linux-mips.org>
Signed-off-by Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/i2c/algos/Kconfig           |    6 -
 drivers/i2c/algos/Makefile          |    1 
 drivers/i2c/algos/i2c-algo-sibyte.c |  186 -----------------------------------
 drivers/i2c/busses/i2c-sibyte.c     |  158 +++++++++++++++++++++++++++++-
 include/linux/i2c-algo-sibyte.h     |   33 ------
 5 files changed, 155 insertions(+), 229 deletions(-)
drivers/i2c/algos/Kconfig +0 -6
index 3040801..c034820 100644
@@ -53,12 +53,6 @@ config I2C_ALGO8XX
 	tristate "MPC8xx CPM I2C interface"
 	depends on 8xx && I2C
 
-config I2C_ALGO_SIBYTE
-	tristate "SiByte SMBus interface"
-	depends on SIBYTE_SB1xxx_SOC && I2C
-	help
-	  Supports the SiByte SOC on-chip I2C interfaces (2 channels).
-
 config I2C_ALGO_SGI
 	tristate "I2C SGI interfaces"
 	depends on I2C && (SGI_IP22 || SGI_IP32 || X86_VISWS)
drivers/i2c/algos/Makefile +0 -1
index 867fe1f..208be04 100644
@@ -6,7 +6,6 @@ obj-$(CONFIG_I2C_ALGOBIT)	+= i2c-algo-bi
 obj-$(CONFIG_I2C_ALGOPCF)	+= i2c-algo-pcf.o
 obj-$(CONFIG_I2C_ALGOPCA)	+= i2c-algo-pca.o
 obj-$(CONFIG_I2C_ALGOITE)	+= i2c-algo-ite.o
-obj-$(CONFIG_I2C_ALGO_SIBYTE)	+= i2c-algo-sibyte.o
 obj-$(CONFIG_I2C_ALGO_SGI)	+= i2c-algo-sgi.o
 
 ifeq ($(CONFIG_I2C_DEBUG_ALGO),y)
drivers/i2c/algos/i2c-algo-sibyte.c deleted +0 -186

186 lines not on this page · raw message

drivers/i2c/busses/i2c-sibyte.c +155 -3

180 lines not on this page · raw message

include/linux/i2c-algo-sibyte.h deleted +0 -33
deleted file mode 100644
index 03914de..0000000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2001,2002,2003 Broadcom Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef I2C_ALGO_SIBYTE_H
-#define I2C_ALGO_SIBYTE_H 1
-
-#include <linux/i2c.h>
-
-struct i2c_algo_sibyte_data {
-	void *data;		/* private data */
-        int   bus;		/* which bus */
-        void *reg_base;		/* CSR base */
-};
-
-int i2c_sibyte_add_bus(struct i2c_adapter *, int speed);
-int i2c_sibyte_del_bus(struct i2c_adapter *);
-
-#endif /* I2C_ALGO_SIBYTE_H */
Signature · 1 line
1.4.2.1