From: H Hartley Sweeten Date: Thu, 18 Apr 2013 21:33:40 +0000 (-0700) Subject: staging: comedi: amplc_dio200: use comedi_legacy_detach() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=60cb3b02bc74c90aaa77d1acda1eff73c8dda478;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: amplc_dio200: use comedi_legacy_detach() The I/O region used by this driver is always requested using comedi_request_region(). The devpriv->io union is only used by the common code shared by the legacy and PCI drivers. Use the new comedi_legacy_detach() helper in the (*detach) to release the I/O region requested by this driver. That function will handle the proper sanity checking before releasing the resource. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c index dc35cc9fb081..297750bef0f7 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/drivers/staging/comedi/drivers/amplc_dio200.c @@ -292,14 +292,8 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it) static void dio200_detach(struct comedi_device *dev) { - const struct dio200_board *thisboard = comedi_board(dev); - struct dio200_private *devpriv = dev->private; - - if (!thisboard || !devpriv) - return; amplc_dio200_common_detach(dev); - if (devpriv->io.regtype == io_regtype) - release_region(devpriv->io.u.iobase, thisboard->mainsize); + comedi_legacy_detach(dev); } static struct comedi_driver amplc_dio200_driver = {