i2c: muxes: rename first set of drivers to a standard pattern

Apply a naming pattern like in the rest of the subsystem to a first set
of mux drivers. Those drivers are the low-hanging fruit; we want to pick
them to motivate upcoming drivers to follow the new pattern. The missing
GPIO driver will be converted in a later patch.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> (pca9541)
Acked-by: Jean Delvare <khali@linux-fr.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 7071633..f0c3b45 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5104,7 +5104,7 @@ PCA9541 I2C BUS MASTER SELECTOR DRIVER
 M:     Guenter Roeck <guenter.roeck@ericsson.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
-F:     drivers/i2c/muxes/pca9541.c
+F:     drivers/i2c/muxes/i2c-mux-pca9541.c
 
 PCA9564/PCA9665 I2C BUS DRIVER
 M:     Wolfram Sang <w.sang@pengutronix.de>

diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 90b7a01..e14a420 100644 (file)
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -25,7 +25,7 @@ config I2C_MUX_PCA9541
          I2C Master Selector.
 
          This driver can also be built as a module.  If so, the module
-         will be called pca9541.
+         will be called i2c-mux-pca9541.
 
 config I2C_MUX_PCA954x
        tristate "Philips PCA954x I2C Mux/switches"
@@ -35,6 +35,6 @@ config I2C_MUX_PCA954x
          I2C mux/switch devices.
 
          This driver can also be built as a module.  If so, the module
-         will be called pca954x.
+         will be called i2c-mux-pca954x.
 
 endmenu

diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile
index 4640436..0868335 100644 (file)
--- a/drivers/i2c/muxes/Makefile
+++ b/drivers/i2c/muxes/Makefile
@@ -2,7 +2,7 @@
 # Makefile for multiplexer I2C chip drivers.
 
 obj-$(CONFIG_I2C_MUX_GPIO)     += gpio-i2cmux.o
-obj-$(CONFIG_I2C_MUX_PCA9541)  += pca9541.o
-obj-$(CONFIG_I2C_MUX_PCA954x)  += pca954x.o
+obj-$(CONFIG_I2C_MUX_PCA9541)  += i2c-mux-pca9541.o
+obj-$(CONFIG_I2C_MUX_PCA954x)  += i2c-mux-pca954x.o
 
 ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG

diff --git a/drivers/i2c/muxes/pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
similarity index 100%
rename from drivers/i2c/muxes/pca9541.c
rename to drivers/i2c/muxes/i2c-mux-pca9541.c

diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
similarity index 100%
rename from drivers/i2c/muxes/pca954x.c
rename to drivers/i2c/muxes/i2c-mux-pca954x.c