staging: comedi: rtd520: remove the '#if 0' code in the attach
PATCH 87/90 staging: comedi: rtd520: remove the '#if 0' code in the attach
This driver has code #if 0'ed out that would allow cleaning up the attach if there was an error. The comedi core currently calls the detach function to do this if the attach fails.
Remove the #if 0'ed out code.
Signed-off-by H Hartley Sweeten <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
--- drivers/staging/comedi/drivers/rtd520.c | 46 --------------------------------- 1 file changed, 46 deletions(-)
drivers/staging/comedi/drivers/rtd520.c +0 -46
@@ -1886,52 +1886,6 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)printk ("\ncomedi%d: rtd520 driver attached.\n" , dev->minor);return 1 ; - -#if 0 -/* hit an error, clean up memory and return ret */ -/* rtd_attach_die_error: */ -#ifdef USE_DMA -for (index =0 ; index <DMA_CHAIN_COUNT ; index++) { -if (NULL != devpriv->dma0Buff[index]) {/* free buffer memory */ -pci_free_consistent (devpriv->pci_dev, -sizeof (u16) * devpriv->fifoLen /2 , - devpriv->dma0Buff[index], - devpriv->dma0BuffPhysAddr[index]); - devpriv->dma0Buff[index] =NULL ; - } - } -if (NULL != devpriv->dma0Chain) { -pci_free_consistent (devpriv->pci_dev, -sizeof (struct plx_dma_desc ) - *DMA_CHAIN_COUNT , - devpriv->dma0Chain, - devpriv->dma0ChainPhysAddr); - devpriv->dma0Chain =NULL ; - } -#endif /* USE_DMA */ -/* subdevices and priv are freed by the core */ -if (dev->irq) { -writel (readl (devpriv->lcfg +LCFG_ITCSR ) & - ~(ICS_PLIE |ICS_DMA0_E |ICS_DMA1_E ), - devpriv->lcfg +LCFG_ITCSR ); -free_irq (dev->irq, dev); - } - -/* release all regions that were allocated */ -if (devpriv->las0) -iounmap (devpriv->las0); - -if (devpriv->las1) -iounmap (devpriv->las1); - -if (devpriv->lcfg) -iounmap (devpriv->lcfg); - -if (devpriv->pci_dev) -pci_dev_put (devpriv->pci_dev); - -return ret; -#endif }static void rtd_detach (struct comedi_device *dev)
Signature · 1 line
1.7.11