← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/staging/comedi/drivers/multiq3.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/staging/comedi/drivers/multiq3.c
83
83
 
84
84
#define MULTIQ3_TIMEOUT 30
85
85
 
86
 
static int multiq3_attach(struct comedi_device *dev,
87
 
                          struct comedi_devconfig *it);
88
 
static int multiq3_detach(struct comedi_device *dev);
89
 
static struct comedi_driver driver_multiq3 = {
90
 
        .driver_name = "multiq3",
91
 
        .module = THIS_MODULE,
92
 
        .attach = multiq3_attach,
93
 
        .detach = multiq3_detach,
94
 
};
95
 
 
96
 
static int __init driver_multiq3_init_module(void)
97
 
{
98
 
        return comedi_driver_register(&driver_multiq3);
99
 
}
100
 
 
101
 
static void __exit driver_multiq3_cleanup_module(void)
102
 
{
103
 
        comedi_driver_unregister(&driver_multiq3);
104
 
}
105
 
 
106
 
module_init(driver_multiq3_init_module);
107
 
module_exit(driver_multiq3_cleanup_module);
108
 
 
109
86
struct multiq3_private {
110
87
        unsigned int ao_readback[2];
111
88
};
338
315
        return 0;
339
316
}
340
317
 
341
 
static int multiq3_detach(struct comedi_device *dev)
 
318
static void multiq3_detach(struct comedi_device *dev)
342
319
{
343
 
        printk(KERN_INFO "comedi%d: multiq3: remove\n", dev->minor);
344
 
 
345
320
        if (dev->iobase)
346
321
                release_region(dev->iobase, MULTIQ3_SIZE);
347
322
        if (dev->irq)
348
323
                free_irq(dev->irq, dev);
349
 
 
350
 
        return 0;
351
324
}
352
325
 
 
326
static struct comedi_driver multiq3_driver = {
 
327
        .driver_name    = "multiq3",
 
328
        .module         = THIS_MODULE,
 
329
        .attach         = multiq3_attach,
 
330
        .detach         = multiq3_detach,
 
331
};
 
332
module_comedi_driver(multiq3_driver);
 
333
 
353
334
MODULE_AUTHOR("Comedi http://www.comedi.org");
354
335
MODULE_DESCRIPTION("Comedi low-level driver");
355
336
MODULE_LICENSE("GPL");