lkml.org 
[lkml]   [2006]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/12] PNP: adjust pnp_register_card_driver() signature
    Date
    Remove the assumption that pnp_register_card_driver() returns the
    number of devices claimed. And fix some __init/__devinit issues.

    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

    Index: work-mm6/sound/isa/gus/interwave.c
    ===================================================================
    --- work-mm6.orig/sound/isa/gus/interwave.c 2006-03-22 11:24:41.000000000 -0700
    +++ work-mm6/sound/isa/gus/interwave.c 2006-03-22 12:07:43.000000000 -0700
    @@ -791,7 +791,7 @@
    return 0;
    }

    -static int __init snd_interwave_nonpnp_probe1(int dev, struct platform_device *devptr)
    +static int __devinit snd_interwave_nonpnp_probe1(int dev, struct platform_device *devptr)
    {
    struct snd_card *card;
    int err;
    @@ -809,7 +809,7 @@
    return 0;
    }

    -static int __init snd_interwave_nonpnp_probe(struct platform_device *pdev)
    +static int __devinit snd_interwave_nonpnp_probe(struct platform_device *pdev)
    {
    int dev = pdev->id;
    int err;
    @@ -867,6 +867,7 @@
    };

    #ifdef CONFIG_PNP
    +static unsigned int __devinitdata interwave_pnp_devices;

    static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,
    const struct pnp_card_device_id *pid)
    @@ -897,6 +898,7 @@
    }
    pnp_set_card_drvdata(pcard, card);
    dev++;
    + interwave_pnp_devices++;
    return 0;
    }

    @@ -954,10 +956,10 @@
    }

    /* ISA PnP cards */
    - i = pnp_register_card_driver(&interwave_pnpc_driver);
    - if (i >= 0) {
    + err = pnp_register_card_driver(&interwave_pnpc_driver);
    + if (!err) {
    pnp_registered = 1;
    - cards += i;
    + cards += interwave_pnp_devices;;
    }

    if (!cards) {
    -
    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: 2006-03-22 23:19    [W:4.501 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site