[PATCH 1/2] auxdisplay: img-ascii-lcd: Add a sentinel entry to OF device ID table

[PATCH 1/2] auxdisplay: img-ascii-lcd: Add a sentinel entry to OF device ID table

[Javier Martinez Canillas]

The OF device ID table doesn't have a sentinel NULL entry and so it
causes the following error:

FATAL: drivers/auxdisplay/img-ascii-lcd: struct of_device_id is not terminated with a NULL entry!
scripts/Makefile.modpost:91: recipe for target '__modpost' failed
make[1]: *** [__modpost] Error 1
Makefile:1493: recipe for target 'modules' failed
make: *** [modules] Error 2

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

 drivers/auxdisplay/img-ascii-lcd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c
index bf43b5d2aafc..73bc826144d4 100644
--- a/drivers/auxdisplay/img-ascii-lcd.c
+++ b/drivers/auxdisplay/img-ascii-lcd.c
@@ -218,6 +218,7 @@ static const struct of_device_id img_ascii_lcd_matches[] = {
 	{ .compatible = "img,boston-lcd", .data = &boston_config },
 	{ .compatible = "mti,malta-lcd", .data = &malta_config },
 	{ .compatible = "mti,sead3-lcd", .data = &sead3_config },
+	{ /* sentinel */ },
 };
 
 /**
-- 
2.7.4

[PATCH 2/2] auxdisplay: img-ascii-lcd: Fix module autoload

[Javier Martinez Canillas]

If the driver is built as a module, autoload won't work because the module
alias information is not filled. So user-space can't match the registered
device with the corresponding module.

Export the module alias information using the MODULE_DEVICE_TABLE() macro.

Before this patch:

$ modinfo drivers/auxdisplay/img-ascii-lcd.ko | grep alias
$

After this patch:

$ modinfo drivers/auxdisplay/img-ascii-lcd.ko | grep alias
alias:          of:N*T*Cmti,sead3-lcdC*
alias:          of:N*T*Cmti,sead3-lcd
alias:          of:N*T*Cmti,malta-lcdC*
alias:          of:N*T*Cmti,malta-lcd
alias:          of:N*T*Cimg,boston-lcdC*
alias:          of:N*T*Cimg,boston-lcd

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

 drivers/auxdisplay/img-ascii-lcd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/auxdisplay/img-ascii-lcd.c b/drivers/auxdisplay/img-ascii-lcd.c
index 73bc826144d4..55b792e9275d 100644
--- a/drivers/auxdisplay/img-ascii-lcd.c
+++ b/drivers/auxdisplay/img-ascii-lcd.c
@@ -220,6 +220,7 @@ static const struct of_device_id img_ascii_lcd_matches[] = {
 	{ .compatible = "mti,sead3-lcd", .data = &sead3_config },
 	{ /* sentinel */ },
 };
+MODULE_DEVICE_TABLE(of, img_ascii_lcd_matches);
 
 /**
  * img_ascii_lcd_scroll() - scroll the display by a character
-- 
2.7.4

Re: [PATCH 1/2] auxdisplay: img-ascii-lcd: Add a sentinel entry to OF device ID table

[Javier Martinez Canillas]

Hello,

On 01/02/2017 03:06 PM, Javier Martinez Canillas wrote:
> The OF device ID table doesn't have a sentinel NULL entry and so it
> causes the following error:
> 
> FATAL: drivers/auxdisplay/img-ascii-lcd: struct of_device_id is not terminated with a NULL entry!
> scripts/Makefile.modpost:91: recipe for target '__modpost' failed
> make[1]: *** [__modpost] Error 1
> Makefile:1493: recipe for target 'modules' failed
> make: *** [modules] Error 2
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---

Any comments about this patch and 2/2?

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America