hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i2c: remove deprecated attach_adapter callback 

There aren't any users left. Remove this callback from the 2.4 times.
Phew, finally, that took years to reach...

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2018-08-21 17:02:40 +02:00
parent 3e7bed5271
commit 0c36dd37d5
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/i2c/i2c-core-base.c
View File

@ -62,7 +62,7 @@
/* /*
* core_lock protects i2c_adapter_idr, and guarantees that device detection, * core_lock protects i2c_adapter_idr, and guarantees that device detection,
* deletion of detected devices, and attach_adapter calls are serialized * deletion of detected devices are serialized
*/ */
static DEFINE_MUTEX(core_lock); static DEFINE_MUTEX(core_lock);
static DEFINE_IDR(i2c_adapter_idr); static DEFINE_IDR(i2c_adapter_idr);
@ -1124,15 +1124,6 @@ static int i2c_do_add_adapter(struct i2c_driver *driver,
/* Detect supported devices on that bus, and instantiate them */ /* Detect supported devices on that bus, and instantiate them */
i2c_detect(adap, driver); i2c_detect(adap, driver);
/* Let legacy drivers scan this bus for matching devices */
if (driver->attach_adapter) {
dev_warn(&adap->dev, "%s: attach_adapter method is deprecated\n",
driver->driver.name);
dev_warn(&adap->dev,
"Please use another way to instantiate your i2c_client\n");
/* We ignore the return code; if it fails, too bad */
driver->attach_adapter(adap);
}
return 0; return 0;
} }

6
include/linux/i2c.h
View File

@ -231,7 +231,6 @@ enum i2c_alert_protocol {
/** /**
* struct i2c_driver - represent an I2C device driver * struct i2c_driver - represent an I2C device driver
* @class: What kind of i2c device we instantiate (for detect) * @class: What kind of i2c device we instantiate (for detect)
* @attach_adapter: Callback for bus addition (deprecated)
* @probe: Callback for device binding - soon to be deprecated * @probe: Callback for device binding - soon to be deprecated
* @probe_new: New callback for device binding * @probe_new: New callback for device binding
* @remove: Callback for device unbinding * @remove: Callback for device unbinding
@ -268,11 +267,6 @@ enum i2c_alert_protocol {
struct i2c_driver { struct i2c_driver {
unsigned int class; unsigned int class;
/* Notifies the driver that a new bus has appeared. You should avoid
* using this, it will be removed in a near future.
*/
int (*attach_adapter)(struct i2c_adapter *) __deprecated;
/* Standard driver model interfaces */ /* Standard driver model interfaces */
int (*probe)(struct i2c_client *, const struct i2c_device_id *); int (*probe)(struct i2c_client *, const struct i2c_device_id *);
int (*remove)(struct i2c_client *); int (*remove)(struct i2c_client *);