Skip to content

Commit b7ef4e0

Browse files
jdelvareAndi Shyti
authored andcommitted
i2c: Drop legacy muxing pseudo-drivers
The i2c-amd756-s4882 and i2c-nforce2-s4985 muxing pseudo-drivers were written at a time when the i2c core did not support muxing. They are essentially board-specific hacks. If we had to add support for these boards today, we would implement it in a completely different way. These Tyan server boards are 19 years old by now, so I very much doubt any of these is still running today. So let's just drop this clumsy code. If anyone really still needs this support and complains, I'll rewrite it in a proper way on top of i2c-mux. This also fixes the following warnings: drivers/i2c/busses/i2c-amd756.c:286:20: warning: symbol 'amd756_smbus' was not declared. Should it be static? drivers/i2c/busses/i2c-nforce2.c:123:20: warning: symbol 'nforce2_smbus' was not declared. Should it be static? Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Andi Shyti <andi.shyti@kernel.org> Cc: Nick Desaulniers <ndesaulniers@google.com> Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
1 parent 5f5c2d4 commit b7ef4e0

File tree

7 files changed

+1
-534
lines changed

7 files changed

+1
-534
lines changed

MAINTAINERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10722,12 +10722,10 @@ F: Documentation/i2c/busses/i2c-viapro.rst
1072210722
F: drivers/i2c/busses/i2c-ali1535.c
1072310723
F: drivers/i2c/busses/i2c-ali1563.c
1072410724
F: drivers/i2c/busses/i2c-ali15x3.c
10725-
F: drivers/i2c/busses/i2c-amd756-s4882.c
1072610725
F: drivers/i2c/busses/i2c-amd756.c
1072710726
F: drivers/i2c/busses/i2c-amd8111.c
1072810727
F: drivers/i2c/busses/i2c-i801.c
1072910728
F: drivers/i2c/busses/i2c-isch.c
10730-
F: drivers/i2c/busses/i2c-nforce2-s4985.c
1073110729
F: drivers/i2c/busses/i2c-nforce2.c
1073210730
F: drivers/i2c/busses/i2c-piix4.*
1073310731
F: drivers/i2c/busses/i2c-sis5595.c

drivers/i2c/busses/Kconfig

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,6 @@ config I2C_AMD756
6262
This driver can also be built as a module. If so, the module
6363
will be called i2c-amd756.
6464

65-
config I2C_AMD756_S4882
66-
tristate "SMBus multiplexing on the Tyan S4882"
67-
depends on I2C_AMD756 && X86
68-
help
69-
Enabling this option will add specific SMBus support for the Tyan
70-
S4882 motherboard. On this 4-CPU board, the SMBus is multiplexed
71-
over 8 different channels, where the various memory module EEPROMs
72-
and temperature sensors live. Saying yes here will give you access
73-
to these in addition to the trunk.
74-
75-
This driver can also be built as a module. If so, the module
76-
will be called i2c-amd756-s4882.
77-
7865
config I2C_AMD8111
7966
tristate "AMD 8111"
8067
depends on PCI && HAS_IOPORT
@@ -268,19 +255,6 @@ config I2C_NFORCE2
268255
This driver can also be built as a module. If so, the module
269256
will be called i2c-nforce2.
270257

271-
config I2C_NFORCE2_S4985
272-
tristate "SMBus multiplexing on the Tyan S4985"
273-
depends on I2C_NFORCE2 && X86
274-
help
275-
Enabling this option will add specific SMBus support for the Tyan
276-
S4985 motherboard. On this 4-CPU board, the SMBus is multiplexed
277-
over 4 different channels, where the various memory module EEPROMs
278-
live. Saying yes here will give you access to these in addition
279-
to the trunk.
280-
281-
This driver can also be built as a module. If so, the module
282-
will be called i2c-nforce2-s4985.
283-
284258
config I2C_NVIDIA_GPU
285259
tristate "NVIDIA GPU I2C controller"
286260
depends on PCI

drivers/i2c/busses/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ obj-$(CONFIG_I2C_ALI1535) += i2c-ali1535.o
1414
obj-$(CONFIG_I2C_ALI1563) += i2c-ali1563.o
1515
obj-$(CONFIG_I2C_ALI15X3) += i2c-ali15x3.o
1616
obj-$(CONFIG_I2C_AMD756) += i2c-amd756.o
17-
obj-$(CONFIG_I2C_AMD756_S4882) += i2c-amd756-s4882.o
1817
obj-$(CONFIG_I2C_AMD8111) += i2c-amd8111.o
1918
obj-$(CONFIG_I2C_CHT_WC) += i2c-cht-wc.o
2019
obj-$(CONFIG_I2C_I801) += i2c-i801.o
2120
obj-$(CONFIG_I2C_ISCH) += i2c-isch.o
2221
obj-$(CONFIG_I2C_ISMT) += i2c-ismt.o
2322
obj-$(CONFIG_I2C_NFORCE2) += i2c-nforce2.o
24-
obj-$(CONFIG_I2C_NFORCE2_S4985) += i2c-nforce2-s4985.o
2523
obj-$(CONFIG_I2C_NVIDIA_GPU) += i2c-nvidia-gpu.o
2624
obj-$(CONFIG_I2C_PIIX4) += i2c-piix4.o
2725
obj-$(CONFIG_I2C_SIS5595) += i2c-sis5595.o

drivers/i2c/busses/i2c-amd756-s4882.c

Lines changed: 0 additions & 245 deletions
This file was deleted.

drivers/i2c/busses/i2c-amd756.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static const struct i2c_algorithm smbus_algorithm = {
283283
.functionality = amd756_func,
284284
};
285285

286-
struct i2c_adapter amd756_smbus = {
286+
static struct i2c_adapter amd756_smbus = {
287287
.owner = THIS_MODULE,
288288
.class = I2C_CLASS_HWMON,
289289
.algo = &smbus_algorithm,
@@ -398,5 +398,3 @@ module_pci_driver(amd756_driver);
398398
MODULE_AUTHOR("Merlin Hughes <merlin@merlin.org>");
399399
MODULE_DESCRIPTION("AMD756/766/768/8111 and nVidia nForce SMBus driver");
400400
MODULE_LICENSE("GPL");
401-
402-
EXPORT_SYMBOL(amd756_smbus);

0 commit comments

Comments
 (0)