Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Fix the MODALIAS generation in modpost for of devices

Since the devices may have multiple (or none) compatible properties,
the uevent generated internally by the kernel may have multiple
"C..." entries. So the MODALIAS stored in the module must have
wilcard before and after the compatible entry.
Also, if the 'compatible' field is not used for matching, there
will be no 'C' and that must handled as well.

The previous code handled all those case incorrectly and it
"mostly" worked ... but not always.

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

authored by

Sylvain Munaut and committed by
Sam Ravnborg
d1ab4235 55b637c6

+8 -3
+8 -3
scripts/mod/file2alias.c
··· 353 353 354 354 static int do_of_entry (const char *filename, struct of_device_id *of, char *alias) 355 355 { 356 + int len; 356 357 char *tmp; 357 - sprintf (alias, "of:N%sT%sC%s", 358 + len = sprintf (alias, "of:N%sT%s", 358 359 of->name[0] ? of->name : "*", 359 - of->type[0] ? of->type : "*", 360 - of->compatible[0] ? of->compatible : "*"); 360 + of->type[0] ? of->type : "*"); 361 + 362 + if (of->compatible[0]) 363 + sprintf (&alias[len], "%sC%s", 364 + of->type[0] ? "*" : "", 365 + of->compatible); 361 366 362 367 /* Replace all whitespace with underscores */ 363 368 for (tmp = alias; tmp && *tmp; tmp++)