[RESEND PATCH 0/2] auxdisplay: img-ascii-lcd: Trivial fixes

[RESEND PATCH 0/2] auxdisplay: img-ascii-lcd: Trivial fixes

[Javier Martinez Canillas]

Hello Andrew,

This series contains two trivial fixes for the img-ascii-lcd auxdisplay
driver. The first version was posted more than 2 months ago [0] and had
no feedback, so I'm resending with you as cc in case these can be picked
through your tree.

[0]: https://lkml.org/lkml/2017/1/2/395

Best regards,
Javier


Javier Martinez Canillas (2):
  auxdisplay: img-ascii-lcd: Add a sentinel entry to OF device ID table
  auxdisplay: img-ascii-lcd: Fix module autoload

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

-- 
2.9.3

[RESEND 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.9.3

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

[Dmitry Torokhov]

On Fri, Mar 10, 2017 at 10:33:06AM -0300, 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>

Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

This was also causing issues with 0-day builder when driver is built
into the kernel.

> ---
> 
>  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.9.3
> 

-- 
Dmitry

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

[Dmitry Torokhov]

On Fri, Mar 10, 2017 at 10:22 AM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
>
> On Fri, Mar 10, 2017 at 10:33:06AM -0300, 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>
>
> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>
> This was also causing issues with 0-day builder when driver is built
> into the kernel.

It looks like Greg KH picked my version of this patch...

Thanks.

-- 
Dmitry

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

[Javier Martinez Canillas]

Hello Dmitry,

On 03/16/2017 03:25 PM, Dmitry Torokhov wrote:
> On Fri, Mar 10, 2017 at 10:22 AM, Dmitry Torokhov
> <dmitry.torokhov@gmail.com> wrote:
>>
>> On Fri, Mar 10, 2017 at 10:33:06AM -0300, 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>
>>
>> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>>
>> This was also causing issues with 0-day builder when driver is built
>> into the kernel.
> 
> It looks like Greg KH picked my version of this patch...
>

Great, glad that your version was picked since it seems these two patches
were never going to make it.
 
> Thanks.
> 

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

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

[Dmitry Torokhov]

On Thu, Mar 16, 2017 at 11:38 AM, Javier Martinez Canillas
<javier@osg.samsung.com> wrote:
> Hello Dmitry,
>
> On 03/16/2017 03:25 PM, Dmitry Torokhov wrote:
>> On Fri, Mar 10, 2017 at 10:22 AM, Dmitry Torokhov
>> <dmitry.torokhov@gmail.com> wrote:
>>>
>>> On Fri, Mar 10, 2017 at 10:33:06AM -0300, 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>
>>>
>>> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>>>
>>> This was also causing issues with 0-day builder when driver is built
>>> into the kernel.
>>
>> It looks like Greg KH picked my version of this patch...
>>
>
> Great, glad that your version was picked since it seems these two patches
> were never going to make it.

How about you try sending the 2nd patch to him as well since he seems
to be picking up auxdisplay changes?

-- 
Dmitry

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

[Javier Martinez Canillas]

Hello Dmitry,

On 03/16/2017 03:41 PM, Dmitry Torokhov wrote:

[snip]

>>>
>>> It looks like Greg KH picked my version of this patch...
>>>
>>
>> Great, glad that your version was picked since it seems these two patches
>> were never going to make it.
> 
> How about you try sending the 2nd patch to him as well since he seems
> to be picking up auxdisplay changes?
> 

Sure, I will. Thanks a lot for the suggestion.

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

[RESEND 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.9.3