lkml.org 
[lkml]   [2007]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 10/14] powerpc: Fix the MODALIAS generation in modpost for of devices
    From 61f24a916b640ae1ac5f7bc783d3bb4d7d833c00 Mon Sep 17 00:00:00 2001
    From: Sylvain Munaut <tnt@246tNt.com>
    Date: Tue, 8 May 2007 19:59:29 +1000
    Subject: [PATCH 10/14] 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>
    ---
    scripts/mod/file2alias.c | 11 ++++++++---
    1 files changed, 8 insertions(+), 3 deletions(-)

    diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
    index ed1244d..f646381 100644
    --- a/scripts/mod/file2alias.c
    +++ b/scripts/mod/file2alias.c
    @@ -353,11 +353,16 @@ static int do_pcmcia_entry(const char *filename,

    static int do_of_entry (const char *filename, struct of_device_id *of, char *alias)
    {
    + int len;
    char *tmp;
    - sprintf (alias, "of:N%sT%sC%s",
    + len = sprintf (alias, "of:N%sT%s",
    of->name[0] ? of->name : "*",
    - of->type[0] ? of->type : "*",
    - of->compatible[0] ? of->compatible : "*");
    + of->type[0] ? of->type : "*");
    +
    + if (of->compatible[0])
    + sprintf (&alias[len], "%sC%s",
    + of->type[0] ? "*" : "",
    + of->compatible);

    /* Replace all whitespace with underscores */
    for (tmp = alias; tmp && *tmp; tmp++)
    --
    1.5.1.rc3.20.gaa453
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-05-18 08:59    [W:5.282 / U:0.632 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site