diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index ef6d52a38..6fac638e4 100755 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -92,25 +92,6 @@ const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id, } EXPORT_SYMBOL_GPL(i2c_match_id); -const void *i2c_get_match_data(const struct i2c_client *client) -{ - struct i2c_driver *driver = to_i2c_driver(client->dev.driver); - const struct i2c_device_id *match; - const void *data; - - data = device_get_match_data(&client->dev); - if (!data) { - match = i2c_match_id(driver->id_table, client); - if (!match) - return NULL; - - data = (const void *)match->driver_data; - } - - return data; -} -EXPORT_SYMBOL(i2c_get_match_data); - static int i2c_device_match(struct device *dev, struct device_driver *drv) { struct i2c_client *client = i2c_verify_client(dev); diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 63476bcf9..6cfb530b3 100755 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -342,8 +342,6 @@ struct i2c_adapter *i2c_verify_adapter(struct device *dev); const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id, const struct i2c_client *client); -const void *i2c_get_match_data(const struct i2c_client *client); - static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj) { struct device * const dev = kobj_to_dev(kobj);