git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
scx200_i2c.c
diff --git
a/drivers/i2c/busses/scx200_i2c.c
b/drivers/i2c/busses/scx200_i2c.c
index
14bcb0a
..
cb3ef5a
100644
(file)
--- a/
drivers/i2c/busses/scx200_i2c.c
+++ b/
drivers/i2c/busses/scx200_i2c.c
@@
-21,8
+21,6
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
@@
-39,14
+37,14
@@
MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>");
MODULE_DESCRIPTION("NatSemi SCx200 I2C Driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("NatSemi SCx200 I2C Driver");
MODULE_LICENSE("GPL");
-MODULE_PARM(scl, "i");
-MODULE_PARM_DESC(scl, "GPIO line for SCL");
-MODULE_PARM(sda, "i");
-MODULE_PARM_DESC(sda, "GPIO line for SDA");
-
static int scl = CONFIG_SCx200_I2C_SCL;
static int sda = CONFIG_SCx200_I2C_SDA;
static int scl = CONFIG_SCx200_I2C_SCL;
static int sda = CONFIG_SCx200_I2C_SDA;
+module_param(scl, int, 0);
+MODULE_PARM_DESC(scl, "GPIO line for SCL");
+module_param(sda, int, 0);
+MODULE_PARM_DESC(sda, "GPIO line for SDA");
+
static void scx200_i2c_setscl(void *data, int state)
{
scx200_gpio_set(scl, state);
static void scx200_i2c_setscl(void *data, int state)
{
scx200_gpio_set(scl, state);
@@
-87,7
+85,7
@@
static struct i2c_adapter scx200_i2c_ops = {
.name = "NatSemi SCx200 I2C",
};
.name = "NatSemi SCx200 I2C",
};
-int scx200_i2c_init(void)
+
static
int scx200_i2c_init(void)
{
pr_debug(NAME ": NatSemi SCx200 I2C Driver\n");
{
pr_debug(NAME ": NatSemi SCx200 I2C Driver\n");
@@
-116,7
+114,7
@@
int scx200_i2c_init(void)
return 0;
}
return 0;
}
-void scx200_i2c_cleanup(void)
+
static
void scx200_i2c_cleanup(void)
{
i2c_bit_del_bus(&scx200_i2c_ops);
}
{
i2c_bit_del_bus(&scx200_i2c_ops);
}