* [PATCH/RFC] input: hil_mlc - Fix hil_mlc_serio_id file2alias failure
@ 2010-10-12 19:17 Geert Uytterhoeven
2010-10-13 6:56 ` Dmitry Torokhov
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2010-10-12 19:17 UTC (permalink / raw)
To: Dzianis Kahanovich, Dmitry Torokhov, Helge Deller
Cc: linux-next, linux-input, Linux/m68k, linux-parisc
Commit e288bf7c346360ac9dafbc1b6d7b6b1a82b51616 ("Input: HIL keyboard and
serio - add missing MODULE_DEVICE_TABLE()") caused the following build
failure on m68k/allmodconfig:
FATAL: drivers/input/serio/hil_mlc: struct serio_device_id is not terminated with a NULL entry!
hil_mlc_serio_id is not an array, but a single struct serio_device_id entry.
Fix the build by converting it into an array, and adding a NULL entry.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k•org>
---
Build failure in linux-next:
http://kisskb.ellerman.id.au/kisskb/buildresult/3385851/
I'm not sure this is the right fix, as hil_mlc_serio_id is a catch-all ID.
Perhaps the MODULE_DEVICE_TABLE() should just be removed again instead?
drivers/input/serio/hil_mlc.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c
index cc8e01f..43904db 100644
--- a/drivers/input/serio/hil_mlc.c
+++ b/drivers/input/serio/hil_mlc.c
@@ -897,11 +897,15 @@ static void hil_mlc_serio_close(struct serio *serio)
/* TODO wake up interruptable */
}
-static const struct serio_device_id hil_mlc_serio_id = {
- .type = SERIO_HIL_MLC,
- .proto = SERIO_HIL,
- .extra = SERIO_ANY,
- .id = SERIO_ANY,
+static const struct serio_device_id hil_mlc_serio_ids[] = {
+ {
+ /* There's only one ID, which is a catch-all */
+ .type = SERIO_HIL_MLC,
+ .proto = SERIO_HIL,
+ .extra = SERIO_ANY,
+ .id = SERIO_ANY,
+ },
+ { 0 }
};
int hil_mlc_register(hil_mlc *mlc)
@@ -934,7 +938,7 @@ int hil_mlc_register(hil_mlc *mlc)
mlc->serio[i] = mlc_serio;
snprintf(mlc_serio->name, sizeof(mlc_serio->name)-1, "HIL_SERIO%d", i);
snprintf(mlc_serio->phys, sizeof(mlc_serio->phys)-1, "HIL%d", i);
- mlc_serio->id = hil_mlc_serio_id;
+ mlc_serio->id = hil_mlc_serio_ids[0];
mlc_serio->id.id = i; /* HIL port no. */
mlc_serio->write = hil_mlc_serio_write;
mlc_serio->open = hil_mlc_serio_open;
@@ -1011,7 +1015,7 @@ static void __exit hil_mlc_exit(void)
}
-MODULE_DEVICE_TABLE(serio, hil_mlc_serio_id);
+MODULE_DEVICE_TABLE(serio, hil_mlc_serio_ids);
module_init(hil_mlc_init);
module_exit(hil_mlc_exit);
--
1.7.0.4
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k•org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH/RFC] input: hil_mlc - Fix hil_mlc_serio_id file2alias failure
2010-10-12 19:17 [PATCH/RFC] input: hil_mlc - Fix hil_mlc_serio_id file2alias failure Geert Uytterhoeven
@ 2010-10-13 6:56 ` Dmitry Torokhov
2010-10-14 15:43 ` Kyle McMartin
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Torokhov @ 2010-10-13 6:56 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Dzianis Kahanovich, Helge Deller, linux-next, linux-input,
Linux/m68k, linux-parisc
On Tue, Oct 12, 2010 at 09:17:49PM +0200, Geert Uytterhoeven wrote:
> Commit e288bf7c346360ac9dafbc1b6d7b6b1a82b51616 ("Input: HIL keyboard and
> serio - add missing MODULE_DEVICE_TABLE()") caused the following build
> failure on m68k/allmodconfig:
>
> FATAL: drivers/input/serio/hil_mlc: struct serio_device_id is not terminated with a NULL entry!
>
> hil_mlc_serio_id is not an array, but a single struct serio_device_id entry.
> Fix the build by converting it into an array, and adding a NULL entry.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k•org>
> ---
> Build failure in linux-next:
> http://kisskb.ellerman.id.au/kisskb/buildresult/3385851/
>
> I'm not sure this is the right fix, as hil_mlc_serio_id is a catch-all ID.
> Perhaps the MODULE_DEVICE_TABLE() should just be removed again instead?
>
Gah, that original patch was incorrect, I should not have applied it at
all... The serio_device_id in question is for serio port that is being
created by the driver and thus of course should not be used in
MODULE_DEVICE_TABLE().
I'll drop it from my 'next' queue.
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH/RFC] input: hil_mlc - Fix hil_mlc_serio_id file2alias failure
2010-10-13 6:56 ` Dmitry Torokhov
@ 2010-10-14 15:43 ` Kyle McMartin
0 siblings, 0 replies; 3+ messages in thread
From: Kyle McMartin @ 2010-10-14 15:43 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Geert Uytterhoeven, Dzianis Kahanovich, Helge Deller, linux-next,
linux-input, Linux/m68k, linux-parisc
On Tue, Oct 12, 2010 at 11:56:02PM -0700, Dmitry Torokhov wrote:
> Gah, that original patch was incorrect, I should not have applied it at
> all... The serio_device_id in question is for serio port that is being
> created by the driver and thus of course should not be used in
> MODULE_DEVICE_TABLE().
>
> I'll drop it from my 'next' queue.
>
Cool, thansk Dmitry!
--Kyle
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-14 15:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-12 19:17 [PATCH/RFC] input: hil_mlc - Fix hil_mlc_serio_id file2alias failure Geert Uytterhoeven
2010-10-13 6:56 ` Dmitry Torokhov
2010-10-14 15:43 ` Kyle McMartin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox