From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031866AbcCQRzL (ORCPT ); Thu, 17 Mar 2016 13:55:11 -0400 Received: from lists.s-osg.org ([54.187.51.154]:54354 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031851AbcCQRzH (ORCPT ); Thu, 17 Mar 2016 13:55:07 -0400 From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Liam Girdwood , Chanwoo Choi , Krzysztof Kozlowski , Mark Brown , Javier Martinez Canillas Subject: [PATCH] regulator: Rename files for Maxim PMIC drivers Date: Thu, 17 Mar 2016 14:54:54 -0300 Message-Id: <1458237294-13730-1-git-send-email-javier@osg.samsung.com> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Most Maxim PMIC regulator drivers are for sub-devices of Multi-Function Devices with drivers under drivers/mfd. But for many of these, the same object file name was used for both the MFD and the regulator drivers. Having 2 different drivers with the same name causes a lot of confusion to Kbuild, specially if these are built as module since only one module will be installed and also exported symbols will be undefined due being overwritten by the other module during modpost. For example, it fixes the following issue when both drivers are module: $ make M=drivers/regulator/ ... CC [M] drivers/regulator//max14577.o Building modules, stage 2. MODPOST 1 modules WARNING: "maxim_charger_calc_reg_current" [drivers/regulator//max14577.ko] undefined! WARNING: "maxim_charger_currents" [drivers/regulator//max14577.ko] undefined! Reported-by: Chanwoo Choi Signed-off-by: Javier Martinez Canillas --- MAINTAINERS | 4 ++-- drivers/regulator/Makefile | 6 +++--- drivers/regulator/{max14577.c => max14577-regulator.c} | 0 drivers/regulator/{max77693.c => max77693-regulator.c} | 0 drivers/regulator/{max8997.c => max8997-regulator.c} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename drivers/regulator/{max14577.c => max14577-regulator.c} (100%) rename drivers/regulator/{max77693.c => max77693-regulator.c} (100%) rename drivers/regulator/{max8997.c => max8997-regulator.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 3c0be602d57c..37218e39f6dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6985,9 +6985,9 @@ M: Chanwoo Choi M: Krzysztof Kozlowski L: linux-kernel@vger.kernel.org S: Supported -F: drivers/*/max14577.c +F: drivers/*/max14577*.c F: drivers/*/max77686*.c -F: drivers/*/max77693.c +F: drivers/*/max77693*.c F: drivers/extcon/extcon-max14577.c F: drivers/extcon/extcon-max77693.c F: drivers/rtc/rtc-max77686.c diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index 61bfbb9d4a0c..8018b2ef13cb 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -46,7 +46,7 @@ obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o obj-$(CONFIG_REGULATOR_LTC3589) += ltc3589.o -obj-$(CONFIG_REGULATOR_MAX14577) += max14577.o +obj-$(CONFIG_REGULATOR_MAX14577) += max14577-regulator.o obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o obj-$(CONFIG_REGULATOR_MAX77620) += max77620-regulator.o obj-$(CONFIG_REGULATOR_MAX8649) += max8649.o @@ -55,10 +55,10 @@ obj-$(CONFIG_REGULATOR_MAX8907) += max8907-regulator.o obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o obj-$(CONFIG_REGULATOR_MAX8973) += max8973-regulator.o -obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o +obj-$(CONFIG_REGULATOR_MAX8997) += max8997-regulator.o obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o obj-$(CONFIG_REGULATOR_MAX77686) += max77686-regulator.o -obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o +obj-$(CONFIG_REGULATOR_MAX77693) += max77693-regulator.o obj-$(CONFIG_REGULATOR_MAX77802) += max77802-regulator.o obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o diff --git a/drivers/regulator/max14577.c b/drivers/regulator/max14577-regulator.c similarity index 100% rename from drivers/regulator/max14577.c rename to drivers/regulator/max14577-regulator.c diff --git a/drivers/regulator/max77693.c b/drivers/regulator/max77693-regulator.c similarity index 100% rename from drivers/regulator/max77693.c rename to drivers/regulator/max77693-regulator.c diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997-regulator.c similarity index 100% rename from drivers/regulator/max8997.c rename to drivers/regulator/max8997-regulator.c -- 2.5.0