lkml.org 
[lkml]   [2006]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 113/141] V4L/DVB (3385): Dvb: fix __init/__exit section references in av7110 driver
    Date
    From: Johannes Stezenbach <js@linuxtv.org>
    Date: 1141009760 -0300

    use __devinit/__devexit/__devexit_p() where appropriate

    Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    ---

    diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
    diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
    index 1aa61bf..d982a50 100644
    --- a/drivers/media/dvb/ttpci/av7110.c
    +++ b/drivers/media/dvb/ttpci/av7110.c
    @@ -2476,7 +2476,8 @@ static int frontend_init(struct av7110 *
    * The same behaviour of missing VSYNC can be duplicated on budget
    * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble.
    */
    -static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext)
    +static int __devinit av7110_attach(struct saa7146_dev* dev,
    + struct saa7146_pci_extension_data *pci_ext)
    {
    const int length = TS_WIDTH * TS_HEIGHT;
    struct pci_dev *pdev = dev->pci;
    @@ -2826,7 +2827,7 @@ err_kfree_0:
    goto out;
    }

    -static int av7110_detach(struct saa7146_dev* saa)
    +static int __devexit av7110_detach(struct saa7146_dev* saa)
    {
    struct av7110 *av7110 = saa->ext_priv;
    dprintk(4, "%p\n", av7110);
    @@ -2973,7 +2974,7 @@ static struct saa7146_extension av7110_e
    .module = THIS_MODULE,
    .pci_tbl = &pci_tbl[0],
    .attach = av7110_attach,
    - .detach = av7110_detach,
    + .detach = __devexit_p(av7110_detach),

    .irq_mask = MASK_19 | MASK_03 | MASK_10,
    .irq_func = av7110_irq,
    diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
    diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
    index 617e4f6..d54bbcd 100644
    --- a/drivers/media/dvb/ttpci/av7110_ir.c
    +++ b/drivers/media/dvb/ttpci/av7110_ir.c
    @@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av
    }


    -int __init av7110_ir_init(struct av7110 *av7110)
    +int __devinit av7110_ir_init(struct av7110 *av7110)
    {
    static struct proc_dir_entry *e;

    @@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110
    }


    -void __exit av7110_ir_exit(struct av7110 *av7110)
    +void __devexit av7110_ir_exit(struct av7110 *av7110)
    {
    int i;

    -
    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-20 17:06    [W:0.021 / U:31.216 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site