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 2/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 a __init/__devinit issue.

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

    Index: work-mm6/sound/isa/als100.c
    ===================================================================
    --- work-mm6.orig/sound/isa/als100.c 2006-03-22 11:24:42.000000000 -0700
    +++ work-mm6/sound/isa/als100.c 2006-03-22 11:48:33.000000000 -0700
    @@ -199,7 +199,7 @@
    return 0;
    }

    -static int __init snd_card_als100_probe(int dev,
    +static int __devinit snd_card_als100_probe(int dev,
    struct pnp_card_link *pcard,
    const struct pnp_card_device_id *pid)
    {
    @@ -281,6 +281,8 @@
    return 0;
    }

    +static unsigned int __devinitdata als100_devices;
    +
    static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
    const struct pnp_card_device_id *id)
    {
    @@ -294,6 +296,7 @@
    if (res < 0)
    return res;
    dev++;
    + als100_devices++;
    return 0;
    }
    return -ENODEV;
    @@ -345,10 +348,13 @@

    static int __init alsa_card_als100_init(void)
    {
    - int cards;
    + int err;
    +
    + err = pnp_register_card_driver(&als100_pnpc_driver);
    + if (err)
    + return err;

    - cards = pnp_register_card_driver(&als100_pnpc_driver);
    - if (cards <= 0) {
    + if (!als100_devices) {
    pnp_unregister_card_driver(&als100_pnpc_driver);
    #ifdef MODULE
    snd_printk(KERN_ERR "no ALS100 based soundcards found\n");
    -
    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:15    [W:0.066 / U:29.584 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site