From: H Hartley Sweeten Date: Wed, 10 Apr 2013 18:26:34 +0000 (-0700) Subject: staging: comedi: daqboard2000: use pci_ioremap_bar() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10e6b5554ac9cc0f3b3951b2aec45451e465f8c3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: comedi: daqboard2000: use pci_ioremap_bar() Use pci_ioremap_bar() to ioremap the PCI resources. That function just takes the pci device and a bar number. It also has some additional sanity checks to make sure the bar is actually a memory resource. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c index a0ec8bd5c01d..ed3d6e510818 100644 --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c @@ -713,10 +713,8 @@ static int daqboard2000_auto_attach(struct comedi_device *dev, if (result) return result; - devpriv->plx = ioremap(pci_resource_start(pcidev, 0), - pci_resource_len(pcidev, 0)); - devpriv->daq = ioremap(pci_resource_start(pcidev, 2), - pci_resource_len(pcidev, 2)); + devpriv->plx = pci_ioremap_bar(pcidev, 0); + devpriv->daq = pci_ioremap_bar(pcidev, 2); if (!devpriv->plx || !devpriv->daq) return -ENOMEM;