AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-07 22:05:19 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: drivers: use comedi_legacy_detach()

Browse Source 
Use comedi_legacy_detach() to release the I/O region requested
by these drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-04-18 14:34:19 -07:00 committed by Greg Kroah-Hartman
parent 3fd19714e3
commit a32c6d0084
24 changed files with 27 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/comedi/drivers/aio_aio12_8.c
View File

@ -262,8 +262,7 @@ static int aio_aio12_8_attach(struct comedi_device *dev,
static void aio_aio12_8_detach(struct comedi_device *dev)
{
comedi_spriv_free(dev, 2);
if (dev->iobase)
release_region(dev->iobase, 24);
comedi_legacy_detach(dev);
}
static struct comedi_driver aio_aio12_8_driver = {

3
drivers/staging/comedi/drivers/amplc_pc236.c
View File

@ -547,8 +547,7 @@ static void pc236_detach(struct comedi_device *dev)
free_irq(dev->irq, dev);
comedi_spriv_free(dev, 0);
if (is_isa_board(thisboard)) {
if (dev->iobase)
release_region(dev->iobase, PC236_IO_SIZE);
comedi_legacy_detach(dev);
} else if (is_pci_board(thisboard)) {
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
comedi_pci_disable(dev);

3
drivers/staging/comedi/drivers/c6xdigio.c
View File

@ -468,8 +468,7 @@ static int c6xdigio_attach(struct comedi_device *dev,
static void c6xdigio_detach(struct comedi_device *dev)
{
if (dev->iobase)
release_region(dev->iobase, C6XDIGIO_SIZE);
comedi_legacy_detach(dev);
pnp_unregister_driver(&c6xdigio_pnp_driver);
}

3
drivers/staging/comedi/drivers/comedi_parport.c
View File

@ -340,10 +340,9 @@ static int parport_attach(struct comedi_device *dev,
static void parport_detach(struct comedi_device *dev)
{
if (dev->iobase)
release_region(dev->iobase, PARPORT_SIZE);
if (dev->irq)
free_irq(dev->irq, dev);
comedi_legacy_detach(dev);
}
static struct comedi_driver parport_driver = {

5
drivers/staging/comedi/drivers/das08_isa.c
View File

@ -195,11 +195,8 @@ static int das08_isa_attach(struct comedi_device *dev,
static void das08_isa_detach(struct comedi_device *dev)
{
const struct das08_board_struct *thisboard = comedi_board(dev);
das08_common_detach(dev);
if (dev->iobase)
release_region(dev->iobase, thisboard->iosize);
comedi_legacy_detach(dev);
}
static struct comedi_driver das08_isa_driver = {

3
drivers/staging/comedi/drivers/das6402.c
View File

@ -328,8 +328,7 @@ static void das6402_detach(struct comedi_device *dev)
{
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
release_region(dev->iobase, DAS6402_SIZE);
comedi_legacy_detach(dev);
}
static struct comedi_driver das6402_driver = {

5
drivers/staging/comedi/drivers/das800.c
View File

@ -524,11 +524,10 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void das800_detach(struct comedi_device *dev)
{
if (dev->iobase)
release_region(dev->iobase, DAS800_SIZE);
if (dev->irq)
free_irq(dev->irq, dev);
};
comedi_legacy_detach(dev);
}
static int das800_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
{

3
drivers/staging/comedi/drivers/dmm32at.c
View File

@ -824,8 +824,7 @@ static void dmm32at_detach(struct comedi_device *dev)
{
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
release_region(dev->iobase, DMM32AT_MEMSIZE);
comedi_legacy_detach(dev);
}
static struct comedi_driver dmm32at_driver = {

3
drivers/staging/comedi/drivers/dt2811.c
View File

@ -560,8 +560,7 @@ static void dt2811_detach(struct comedi_device *dev)
{
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
release_region(dev->iobase, DT2811_SIZE);
comedi_legacy_detach(dev);
}
static const struct dt2811_board boardtypes[] = {

3
drivers/staging/comedi/drivers/dt2814.c
View File

@ -327,8 +327,7 @@ static void dt2814_detach(struct comedi_device *dev)
{
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
release_region(dev->iobase, DT2814_SIZE);
comedi_legacy_detach(dev);
}
static struct comedi_driver dt2814_driver = {

3
drivers/staging/comedi/drivers/dt282x.c
View File

@ -1273,8 +1273,6 @@ static void dt282x_detach(struct comedi_device *dev)
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
release_region(dev->iobase, DT2821_SIZE);
if (dev->private) {
if (devpriv->dma[0].chan)
free_dma(devpriv->dma[0].chan);
@ -1285,6 +1283,7 @@ static void dt282x_detach(struct comedi_device *dev)
if (devpriv->dma[1].buf)
free_page((unsigned long)devpriv->dma[1].buf);
}
comedi_legacy_detach(dev);
}
static const struct dt282x_board boardtypes[] = {

5
drivers/staging/comedi/drivers/ni_at_a2150.c
View File

@ -827,10 +827,8 @@ static void a2150_detach(struct comedi_device *dev)
{
struct a2150_private *devpriv = dev->private;
if (dev->iobase) {
if (dev->iobase)
outw(APD_BIT | DPD_BIT, dev->iobase + CONFIG_REG);
release_region(dev->iobase, A2150_SIZE);
}
if (dev->irq)
free_irq(dev->irq, dev);
if (devpriv) {
@ -838,6 +836,7 @@ static void a2150_detach(struct comedi_device *dev)
free_dma(devpriv->dma);
kfree(devpriv->dma_buffer);
}
comedi_legacy_detach(dev);
};
static struct comedi_driver ni_at_a2150_driver = {

3
drivers/staging/comedi/drivers/ni_atmio.c
View File

@ -499,10 +499,9 @@ static void ni_atmio_detach(struct comedi_device *dev)
struct ni_private *devpriv = dev->private;
mio_common_detach(dev);
if (dev->iobase)
release_region(dev->iobase, NI_SIZE);
if (dev->irq)
free_irq(dev->irq, dev);
comedi_legacy_detach(dev);
if (devpriv->isapnp_dev)
pnp_device_detach(devpriv->isapnp_dev);
}

3
drivers/staging/comedi/drivers/ni_atmio16d.c
View File

@ -771,8 +771,7 @@ static void atmio16d_detach(struct comedi_device *dev)
if (dev->irq)
free_irq(dev->irq, dev);
reset_atmio16d(dev);
if (dev->iobase)
release_region(dev->iobase, ATMIO16D_SIZE);
comedi_legacy_detach(dev);
}
static const struct atmio16_board_t atmio16_boards[] = {

4
drivers/staging/comedi/drivers/ni_labpc.c
View File

@ -1872,8 +1872,8 @@ void labpc_common_detach(struct comedi_device *dev)
#endif
if (dev->irq)
free_irq(dev->irq, dev);
if (board->bustype == isa_bustype && dev->iobase)
release_region(dev->iobase, LABPC_SIZE);
if (board->bustype == isa_bustype)
comedi_legacy_detach(dev);
#ifdef CONFIG_COMEDI_PCI_DRIVERS
if (devpriv->mite) {
mite_unsetup(devpriv->mite);

3
drivers/staging/comedi/drivers/pcl711.c
View File

@ -554,8 +554,7 @@ static void pcl711_detach(struct comedi_device *dev)
{
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
release_region(dev->iobase, PCL711_SIZE);
comedi_legacy_detach(dev);
}
static const struct pcl711_board boardtypes[] = {

3
drivers/staging/comedi/drivers/pcl724.c
View File

@ -169,7 +169,6 @@ static int pcl724_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void pcl724_detach(struct comedi_device *dev)
{
const struct pcl724_board *board = comedi_board(dev);
int i;
for (i = 0; i < dev->n_subdevices; i++)
@ -178,7 +177,7 @@ static void pcl724_detach(struct comedi_device *dev)
if (dev->irq)
free_irq(dev->irq, dev);
#endif
release_region(dev->iobase, board->io_range);
comedi_legacy_detach(dev);
}
static const struct pcl724_board boardtypes[] = {

5
drivers/staging/comedi/drivers/pcl726.c
View File

@ -337,14 +337,11 @@ static int pcl726_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void pcl726_detach(struct comedi_device *dev)
{
const struct pcl726_board *board = comedi_board(dev);
#ifdef ACL6126_IRQ
if (dev->irq)
free_irq(dev->irq, dev);
#endif
if (dev->iobase)
release_region(dev->iobase, board->io_range);
comedi_legacy_detach(dev);
}
static struct comedi_driver pcl726_driver = {

4
drivers/staging/comedi/drivers/pcl816.c
View File

@ -1195,7 +1195,6 @@ case COMEDI_SUBD_DO:
static void pcl816_detach(struct comedi_device *dev)
{
const struct pcl816_board *board = comedi_board(dev);
struct pcl816_private *devpriv = dev->private;
if (dev->private) {
@ -1219,12 +1218,11 @@ static void pcl816_detach(struct comedi_device *dev)
}
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
release_region(dev->iobase, board->io_range);
#ifdef unused
if (devpriv->dma_rtc)
RTC_lock--;
#endif
comedi_legacy_detach(dev);
}
static const struct pcl816_board boardtypes[] = {

3
drivers/staging/comedi/drivers/pcl818.c
View File

@ -1900,8 +1900,7 @@ static void pcl818_detach(struct comedi_device *dev)
}
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
release_region(dev->iobase, devpriv->io_range);
comedi_legacy_detach(dev);
}
static const struct pcl818_board boardtypes[] = {

3
drivers/staging/comedi/drivers/pcm3724.c
View File

@ -256,8 +256,7 @@ static void pcm3724_detach(struct comedi_device *dev)
for (i = 0; i < dev->n_subdevices; i++)
comedi_spriv_free(dev, i);
if (dev->iobase)
release_region(dev->iobase, PCM3724_SIZE);
comedi_legacy_detach(dev);
}
static struct comedi_driver pcm3724_driver = {

3
drivers/staging/comedi/drivers/pcmad.c
View File

@ -137,8 +137,7 @@ static void pcmad_detach(struct comedi_device *dev)
{
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase)
release_region(dev->iobase, PCMAD_SIZE);
comedi_legacy_detach(dev);
}
static const struct pcmad_board_struct pcmad_boards[] = {

3
drivers/staging/comedi/drivers/pcmmio.c
View File

@ -1206,14 +1206,13 @@ static void pcmmio_detach(struct comedi_device *dev)
struct pcmmio_private *devpriv = dev->private;
int i;
if (dev->iobase)
release_region(dev->iobase, 32);
for (i = 0; i < MAX_ASICS; ++i) {
if (devpriv && devpriv->asics[i].irq)
free_irq(devpriv->asics[i].irq, dev);
}
if (devpriv && devpriv->sprivs)
kfree(devpriv->sprivs);
comedi_legacy_detach(dev);
}
static struct comedi_driver pcmmio_driver = {

4
drivers/staging/comedi/drivers/pcmuio.c
View File

@ -935,18 +935,16 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void pcmuio_detach(struct comedi_device *dev)
{
const struct pcmuio_board *board = comedi_board(dev);
struct pcmuio_private *devpriv = dev->private;
int i;
if (dev->iobase)
release_region(dev->iobase, ASIC_IOSIZE * board->num_asics);
for (i = 0; i < MAX_ASICS; ++i) {
if (devpriv->asics[i].irq)
free_irq(devpriv->asics[i].irq, dev);
}
if (devpriv && devpriv->sprivs)
kfree(devpriv->sprivs);
comedi_legacy_detach(dev);
}
static const struct pcmuio_board pcmuio_boards[] = {