aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-07-14 16:38:34 -0400
committerJean Delvare <khali@mahadeva.delvare>2008-07-14 16:38:34 -0400
commitf6a7110520037ba786f17b53790c6eb8a3d4ef55 (patch)
treeb26992317518c0aab93e0ec14ebaf990a73a941d
parent954a99307f256f1badd751a2e128c09af235c317 (diff)
i2c-dev: Delete empty detach_client callback
Implementing detach_client is optional, so there is no point in an empty implementation. Likewise, i2c driver IDs are optional, and we don't need one. Signed-off-by: Jean Delvare <khali@linux-fr.org>
-rw-r--r--drivers/i2c/i2c-dev.c7
-rw-r--r--include/linux/i2c-id.h2
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index e96d98696782..50df53640c78 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -548,19 +548,12 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
548 return 0; 548 return 0;
549} 549}
550 550
551static int i2cdev_detach_client(struct i2c_client *client)
552{
553 return 0;
554}
555
556static struct i2c_driver i2cdev_driver = { 551static struct i2c_driver i2cdev_driver = {
557 .driver = { 552 .driver = {
558 .name = "dev_driver", 553 .name = "dev_driver",
559 }, 554 },
560 .id = I2C_DRIVERID_I2CDEV,
561 .attach_adapter = i2cdev_attach_adapter, 555 .attach_adapter = i2cdev_attach_adapter,
562 .detach_adapter = i2cdev_detach_adapter, 556 .detach_adapter = i2cdev_detach_adapter,
563 .detach_client = i2cdev_detach_client,
564}; 557};
565 558
566/* ------------------------------------------------------------------------- */ 559/* ------------------------------------------------------------------------- */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 988e566d3ed5..ef13b7c66df3 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -91,8 +91,6 @@
91#define I2C_DRIVERID_M52790 95 /* Mitsubishi M52790SP/FP AV switch */ 91#define I2C_DRIVERID_M52790 95 /* Mitsubishi M52790SP/FP AV switch */
92#define I2C_DRIVERID_CS5345 96 /* cs5345 audio processor */ 92#define I2C_DRIVERID_CS5345 96 /* cs5345 audio processor */
93 93
94#define I2C_DRIVERID_I2CDEV 900
95
96#define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */ 94#define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */
97 95
98/* 96/*