diff options
| author | Linus Torvalds | 2018-08-24 08:57:26 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2018-08-24 08:57:26 -0700 |
| commit | 019cddc88f9e4ae0de2c76802f7137210c2101aa (patch) | |
| tree | d12338e2dda7e667e40513036d2b020e4745d028 /include | |
| parent | d002924f934ad4d249f6716680433c912831d046 (diff) | |
| parent | 00efcdce67a365ec1881a6fbf17f769d690244e9 (diff) | |
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull second i2c update from Wolfram Sang:
"As promised, here is my 2nd pull request for I2C, containing:
- removal of the attach_adapter callback, converting its last user
- removal of any __deprecated usage within I2C
- one email address update
- some SPDX conversion"
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: don't use any __deprecated handling anymore
i2c: use SPDX identifier for Renesas drivers
i2c: ocores: update my email address
i2c: remove deprecated attach_adapter callback
macintosh: therm_windtunnel: drop using attach_adapter
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c.h | 6 | ||||
| -rw-r--r-- | include/linux/platform_data/i2c-ocores.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 36f357ecdf67..b79387fd57da 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -231,7 +231,6 @@ enum i2c_alert_protocol { /** * struct i2c_driver - represent an I2C device driver * @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_new: New callback for device binding * @remove: Callback for device unbinding @@ -268,11 +267,6 @@ enum i2c_alert_protocol { struct i2c_driver { 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 */ int (*probe)(struct i2c_client *, const struct i2c_device_id *); int (*remove)(struct i2c_client *); diff --git a/include/linux/platform_data/i2c-ocores.h b/include/linux/platform_data/i2c-ocores.h index 01edd96fe1f7..113d6b12f650 100644 --- a/include/linux/platform_data/i2c-ocores.h +++ b/include/linux/platform_data/i2c-ocores.h @@ -1,7 +1,7 @@ /* * i2c-ocores.h - definitions for the i2c-ocores interface * - * Peter Korsgaard <jacmet@sunsite.dk> + * Peter Korsgaard <peter@korsgaard.com> * * This file is licensed under the terms of the GNU General Public License * version 2. This program is licensed "as is" without any warranty of any |