public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] regulator: Rename files for max77686 and max77802 drivers
@ 2016-02-12  4:14 Javier Martinez Canillas
  2016-02-14  6:53 ` Krzysztof Kozlowski
  2016-02-15  6:37 ` Andi Shyti
  0 siblings, 2 replies; 4+ messages in thread
From: Javier Martinez Canillas @ 2016-02-12  4:14 UTC (permalink / raw)
  To: linux-kernel
  Cc: Andi Shyti, Liam Girdwood, linux-samsung-soc, Krzysztof Kozlowski,
	Mark Brown, Javier Martinez Canillas

The max77686 and max77802 regulator drivers are for sub-devices of a MFD
driver for some PMIC blocks. But the same object file name (max77686.o)
was used for both the common MFD driver and the max77686 regulator one.

This confuses kbuild if both drivers are built as module causing the MFD
driver to not be copied when installing the modules.

Also, max77{686,802} are a quite generic name for MFD subdevices drivers
so it is better to rename them to max77{686,802}-regulator like it's the
case for most regulator drivers.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

 MAINTAINERS                                            | 2 +-
 drivers/regulator/Makefile                             | 4 ++--
 drivers/regulator/{max77686.c => max77686-regulator.c} | 0
 drivers/regulator/{max77802.c => max77802-regulator.c} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/regulator/{max77686.c => max77686-regulator.c} (100%)
 rename drivers/regulator/{max77802.c => max77802-regulator.c} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 97b99f24ea53..863eb59e101b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6904,7 +6904,7 @@ MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
 M:	Javier Martinez Canillas <javier@osg.samsung.com>
 L:	linux-kernel@vger.kernel.org
 S:	Supported
-F:	drivers/*/*max77802.c
+F:	drivers/*/*max77802*.c
 F:	Documentation/devicetree/bindings/*/*max77802.txt
 F:	include/dt-bindings/*/*max77802.h
 
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 348cfd727350..bd6ae0ccd2e9 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -55,9 +55,9 @@ obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o
 obj-$(CONFIG_REGULATOR_MAX8973) += max8973-regulator.o
 obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o
 obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
-obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o
+obj-$(CONFIG_REGULATOR_MAX77686) += max77686-regulator.o
 obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o
-obj-$(CONFIG_REGULATOR_MAX77802) += max77802.o
+obj-$(CONFIG_REGULATOR_MAX77802) += max77802-regulator.o
 obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
 obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
 obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686-regulator.c
similarity index 100%
rename from drivers/regulator/max77686.c
rename to drivers/regulator/max77686-regulator.c
diff --git a/drivers/regulator/max77802.c b/drivers/regulator/max77802-regulator.c
similarity index 100%
rename from drivers/regulator/max77802.c
rename to drivers/regulator/max77802-regulator.c
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-02-15 14:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-12  4:14 [PATCH] regulator: Rename files for max77686 and max77802 drivers Javier Martinez Canillas
2016-02-14  6:53 ` Krzysztof Kozlowski
2016-02-15 14:44   ` Javier Martinez Canillas
2016-02-15  6:37 ` Andi Shyti

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox