[v2] drivers: mfd: 88pm800: fix warning same module names

Message ID 20190612081203.1477-1-anders.roxell@linaro.org
State New
Headers show
Series
  • [v2] drivers: mfd: 88pm800: fix warning same module names
Related show

Commit Message

Anders Roxell June 12, 2019, 8:12 a.m.
When building with CONFIG_MFD_88PM800 and CONFIG_REGULATOR_88PM800
enabled as loadable modules, we see the following warning:

warning: same module names found:
  drivers/regulator/88pm800.ko
  drivers/mfd/88pm800.ko

Rework so the names matches the config fragment.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 drivers/mfd/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

-- 
2.20.1

Comments

Lee Jones June 12, 2019, 10:21 a.m. | #1
On Wed, 12 Jun 2019, Anders Roxell wrote:

> When building with CONFIG_MFD_88PM800 and CONFIG_REGULATOR_88PM800

> enabled as loadable modules, we see the following warning:

> 

> warning: same module names found:

>   drivers/regulator/88pm800.ko

>   drivers/mfd/88pm800.ko

> 

> Rework so the names matches the config fragment.


Please detail what this actually changes.

I.e. what the new modules names will be.

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> ---

>  drivers/mfd/Makefile | 7 +++++--

>  1 file changed, 5 insertions(+), 2 deletions(-)

> 

> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile

> index 52b1a90ff515..5e870eef6a20 100644

> --- a/drivers/mfd/Makefile

> +++ b/drivers/mfd/Makefile

> @@ -5,8 +5,11 @@

>  

>  88pm860x-objs			:= 88pm860x-core.o 88pm860x-i2c.o

>  obj-$(CONFIG_MFD_88PM860X)	+= 88pm860x.o

> -obj-$(CONFIG_MFD_88PM800)	+= 88pm800.o 88pm80x.o

> -obj-$(CONFIG_MFD_88PM805)	+= 88pm805.o 88pm80x.o

> +obj-$(CONFIG_MFD_88PM800)	+= mfd-88pm800.o mfd-88pm80x.o

> +mfd-88pm800-objs		:= 88pm800.o

> +obj-$(CONFIG_MFD_88PM805)	+= mfd-88pm805.o mfd-88pm80x.o

> +mfd-88pm805-objs		:= 88pm805.o

> +mfd-88pm80x-objs		:= 88pm80x.o

>  obj-$(CONFIG_MFD_ACT8945A)	+= act8945a.o

>  obj-$(CONFIG_MFD_SM501)		+= sm501.o

>  obj-$(CONFIG_MFD_ASIC3)		+= asic3.o tmio_core.o


-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Patch

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 52b1a90ff515..5e870eef6a20 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -5,8 +5,11 @@ 
 
 88pm860x-objs			:= 88pm860x-core.o 88pm860x-i2c.o
 obj-$(CONFIG_MFD_88PM860X)	+= 88pm860x.o
-obj-$(CONFIG_MFD_88PM800)	+= 88pm800.o 88pm80x.o
-obj-$(CONFIG_MFD_88PM805)	+= 88pm805.o 88pm80x.o
+obj-$(CONFIG_MFD_88PM800)	+= mfd-88pm800.o mfd-88pm80x.o
+mfd-88pm800-objs		:= 88pm800.o
+obj-$(CONFIG_MFD_88PM805)	+= mfd-88pm805.o mfd-88pm80x.o
+mfd-88pm805-objs		:= 88pm805.o
+mfd-88pm80x-objs		:= 88pm80x.o
 obj-$(CONFIG_MFD_ACT8945A)	+= act8945a.o
 obj-$(CONFIG_MFD_SM501)		+= sm501.o
 obj-$(CONFIG_MFD_ASIC3)		+= asic3.o tmio_core.o