From 0edfe760a771bb5ec6f1744fe62a6210ffaad539 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 15 Nov 2007 19:24:02 +0100 Subject: [PATCH] --- yaml --- r: 73831 b: refs/heads/master c: 5e31c2bd3c865f8f474811340182795396b99696 h: refs/heads/master i: 73829: 05830690de35976efb270534300e61dffbef0834 73827: 17157c089b9b494f97895d2551fdeded87eb6b00 73823: b82b04c41fb1e0b5b375555002502185488cef84 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/i2c-core.c | 3 +-- trunk/include/linux/i2c.h | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index f6649b3e9912..99ae7dae9ed9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd4217d8c6ef48425c8d6b28d2e089a83e01af04 +refs/heads/master: 5e31c2bd3c865f8f474811340182795396b99696 diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c index 1a4e8dc03b36..b5e13e405e72 100644 --- a/trunk/drivers/i2c/i2c-core.c +++ b/trunk/drivers/i2c/i2c-core.c @@ -673,7 +673,7 @@ static int __i2c_check_addr(struct i2c_adapter *adapter, unsigned int addr) return 0; } -int i2c_check_addr(struct i2c_adapter *adapter, int addr) +static int i2c_check_addr(struct i2c_adapter *adapter, int addr) { int rval; @@ -683,7 +683,6 @@ int i2c_check_addr(struct i2c_adapter *adapter, int addr) return rval; } -EXPORT_SYMBOL(i2c_check_addr); int i2c_attach_client(struct i2c_client *client) { diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h index 8033e6b33271..a100c9f8eb7c 100644 --- a/trunk/include/linux/i2c.h +++ b/trunk/include/linux/i2c.h @@ -400,11 +400,6 @@ extern int i2c_release_client(struct i2c_client *); extern void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg); -/* returns -EBUSY if address has been taken, 0 if not. Note that the only - other place at which this is called is within i2c_attach_client; so - you can cheat by simply not registering. Not recommended, of course! */ -extern int i2c_check_addr (struct i2c_adapter *adapter, int addr); - /* Detect function. It iterates over all possible addresses itself. * It will only call found_proc if some client is connected at the * specific address (unless a 'force' matched);