[PATCH] extcon: link devres into core module

[PATCH] extcon: link devres into core module

[Arnd Bergmann]

Splitting the resource-managed functions into a separate module
means that the extcon core now fails to build because the internal
"extcon_dev_allocate" symbol is not exported:

ERROR: extcon_dev_allocate [drivers/extcon/devres.ko] undefined!

My guess is that the intention was not to have two separate
modules (which could be fixed by adding an export, plus the
normal MODULE_AUTHOR/MODULE_LICENSE/... fields), but have two
source files in the same module.

This fixes the Makefile accordingly, making the name of the
module extcon_core.ko, which is created from building both
extcon.c and devres.c.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: b225d00f3ad2 ("extcon: Split out the resource-managed functions from extcon core")
---
 drivers/extcon/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
index 423ebc8714c5..972c813c375b 100644
--- a/drivers/extcon/Makefile
+++ b/drivers/extcon/Makefile
@@ -2,7 +2,8 @@
 # Makefile for external connector class (extcon) devices
 #
 
-obj-$(CONFIG_EXTCON)		+= extcon.o devres.o
+obj-$(CONFIG_EXTCON)		+= extcon-core.o
+extcon-core-objs		+= extcon.o devres.o
 obj-$(CONFIG_EXTCON_ADC_JACK)	+= extcon-adc-jack.o
 obj-$(CONFIG_EXTCON_ARIZONA)	+= extcon-arizona.o
 obj-$(CONFIG_EXTCON_AXP288)	+= extcon-axp288.o
-- 
2.9.0

Re: [PATCH] extcon: link devres into core module

[Chanwoo Choi]

Hi Arnd,

On 2016년 06월 29일 23:38, Arnd Bergmann wrote:
> Splitting the resource-managed functions into a separate module
> means that the extcon core now fails to build because the internal
> "extcon_dev_allocate" symbol is not exported:
> 
> ERROR: extcon_dev_allocate [drivers/extcon/devres.ko] undefined!
> 
> My guess is that the intention was not to have two separate
> modules (which could be fixed by adding an export, plus the
> normal MODULE_AUTHOR/MODULE_LICENSE/... fields), but have two
> source files in the same module.
> 
> This fixes the Makefile accordingly, making the name of the
> module extcon_core.ko, which is created from building both
> extcon.c and devres.c.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: b225d00f3ad2 ("extcon: Split out the resource-managed functions from extcon core")
> ---
>  drivers/extcon/Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
> index 423ebc8714c5..972c813c375b 100644
> --- a/drivers/extcon/Makefile
> +++ b/drivers/extcon/Makefile
> @@ -2,7 +2,8 @@
>  # Makefile for external connector class (extcon) devices
>  #
>  
> -obj-$(CONFIG_EXTCON)		+= extcon.o devres.o
> +obj-$(CONFIG_EXTCON)		+= extcon-core.o
> +extcon-core-objs		+= extcon.o devres.o
>  obj-$(CONFIG_EXTCON_ADC_JACK)	+= extcon-adc-jack.o
>  obj-$(CONFIG_EXTCON_ARIZONA)	+= extcon-arizona.o
>  obj-$(CONFIG_EXTCON_AXP288)	+= extcon-axp288.o
> 

Thanks for your fixup. Applied it.

Regards,
Chanwoo Choi