Skip to content

Commit 7e72208

Browse files
hkallweitWolfram Sang
authored andcommitted
i2c: Remove I2C_COMPAT config symbol and related code
This code was added with 2bb5095 ("i2c: Provide compatibility links for i2c adapters"). Commit message stated: Provide compatibility links for [...] the time being. We will remove them after a long transition period. 15 years should have been a long enough transition period. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
1 parent 84294c8 commit 7e72208

File tree

2 files changed

+0
-39
lines changed

2 files changed

+0
-39
lines changed

drivers/i2c/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@ config I2C_BOARDINFO
4040
bool
4141
default y
4242

43-
config I2C_COMPAT
44-
bool "Enable compatibility bits for old user-space"
45-
default y
46-
help
47-
Say Y here if you intend to run lm-sensors 3.1.1 or older, or any
48-
other user-space package which expects i2c adapters to be class
49-
devices. If you don't know, say Y.
50-
5143
config I2C_CHARDEV
5244
tristate "I2C device interface"
5345
help

drivers/i2c/i2c-core-base.c

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,10 +1395,6 @@ struct i2c_adapter *i2c_verify_adapter(struct device *dev)
13951395
}
13961396
EXPORT_SYMBOL(i2c_verify_adapter);
13971397

1398-
#ifdef CONFIG_I2C_COMPAT
1399-
static struct class_compat *i2c_adapter_compat_class;
1400-
#endif
1401-
14021398
static void i2c_scan_static_board_info(struct i2c_adapter *adapter)
14031399
{
14041400
struct i2c_devinfo *devinfo;
@@ -1575,14 +1571,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
15751571

15761572
dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
15771573

1578-
#ifdef CONFIG_I2C_COMPAT
1579-
res = class_compat_create_link(i2c_adapter_compat_class, &adap->dev,
1580-
adap->dev.parent);
1581-
if (res)
1582-
dev_warn(&adap->dev,
1583-
"Failed to create compatibility class link\n");
1584-
#endif
1585-
15861574
/* create pre-declared device nodes */
15871575
of_i2c_register_devices(adap);
15881576
i2c_acpi_install_space_handler(adap);
@@ -1789,11 +1777,6 @@ void i2c_del_adapter(struct i2c_adapter *adap)
17891777
device_for_each_child(&adap->dev, NULL, __unregister_client);
17901778
device_for_each_child(&adap->dev, NULL, __unregister_dummy);
17911779

1792-
#ifdef CONFIG_I2C_COMPAT
1793-
class_compat_remove_link(i2c_adapter_compat_class, &adap->dev,
1794-
adap->dev.parent);
1795-
#endif
1796-
17971780
/* device name is gone after device_unregister */
17981781
dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
17991782

@@ -2102,13 +2085,6 @@ static int __init i2c_init(void)
21022085

21032086
i2c_debugfs_root = debugfs_create_dir("i2c", NULL);
21042087

2105-
#ifdef CONFIG_I2C_COMPAT
2106-
i2c_adapter_compat_class = class_compat_register("i2c-adapter");
2107-
if (!i2c_adapter_compat_class) {
2108-
retval = -ENOMEM;
2109-
goto bus_err;
2110-
}
2111-
#endif
21122088
retval = i2c_add_driver(&dummy_driver);
21132089
if (retval)
21142090
goto class_err;
@@ -2121,10 +2097,6 @@ static int __init i2c_init(void)
21212097
return 0;
21222098

21232099
class_err:
2124-
#ifdef CONFIG_I2C_COMPAT
2125-
class_compat_unregister(i2c_adapter_compat_class);
2126-
bus_err:
2127-
#endif
21282100
is_registered = false;
21292101
bus_unregister(&i2c_bus_type);
21302102
return retval;
@@ -2137,9 +2109,6 @@ static void __exit i2c_exit(void)
21372109
if (IS_ENABLED(CONFIG_OF_DYNAMIC))
21382110
WARN_ON(of_reconfig_notifier_unregister(&i2c_of_notifier));
21392111
i2c_del_driver(&dummy_driver);
2140-
#ifdef CONFIG_I2C_COMPAT
2141-
class_compat_unregister(i2c_adapter_compat_class);
2142-
#endif
21432112
debugfs_remove_recursive(i2c_debugfs_root);
21442113
bus_unregister(&i2c_bus_type);
21452114
tracepoint_synchronize_unregister();

0 commit comments

Comments
 (0)