← 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/aio_aio12_8.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/aio_aio12_8.c
209
209
        return 0;
210
210
}
211
211
 
212
 
static int aio_aio12_8_detach(struct comedi_device *dev)
 
212
static void aio_aio12_8_detach(struct comedi_device *dev)
213
213
{
214
214
        subdev_8255_cleanup(dev, &dev->subdevices[2]);
215
215
        if (dev->iobase)
216
216
                release_region(dev->iobase, 24);
217
 
        return 0;
218
217
}
219
218
 
220
 
static struct comedi_driver driver_aio_aio12_8 = {
221
 
        .driver_name = "aio_aio12_8",
222
 
        .module = THIS_MODULE,
223
 
        .attach = aio_aio12_8_attach,
224
 
        .detach = aio_aio12_8_detach,
225
 
        .board_name = &board_types[0].name,
226
 
        .num_names = 1,
227
 
        .offset = sizeof(struct aio12_8_boardtype),
 
219
static struct comedi_driver aio_aio12_8_driver = {
 
220
        .driver_name    = "aio_aio12_8",
 
221
        .module         = THIS_MODULE,
 
222
        .attach         = aio_aio12_8_attach,
 
223
        .detach         = aio_aio12_8_detach,
 
224
        .board_name     = &board_types[0].name,
 
225
        .num_names      = ARRAY_SIZE(board_types),
 
226
        .offset         = sizeof(struct aio12_8_boardtype),
228
227
};
229
 
 
230
 
static int __init driver_aio_aio12_8_init_module(void)
231
 
{
232
 
        return comedi_driver_register(&driver_aio_aio12_8);
233
 
}
234
 
 
235
 
static void __exit driver_aio_aio12_8_cleanup_module(void)
236
 
{
237
 
        comedi_driver_unregister(&driver_aio_aio12_8);
238
 
}
239
 
 
240
 
module_init(driver_aio_aio12_8_init_module);
241
 
module_exit(driver_aio_aio12_8_cleanup_module);
 
228
module_comedi_driver(aio_aio12_8_driver);
242
229
 
243
230
MODULE_AUTHOR("Comedi http://www.comedi.org");
244
231
MODULE_DESCRIPTION("Comedi low-level driver");