From: H Hartley Sweeten Date: Wed, 10 Apr 2013 18:28:47 +0000 (-0700) Subject: staging: comedi: cb_pcidas64: tidy up the *phys_iobase X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=81d985a11e9a51eb88ddea98df8d60bfdda7cafb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: comedi: cb_pcidas64: tidy up the *phys_iobase This driver does not use the dev->iobase so don't bother initializing it. The plx9080_phys_iobase is not used in the driver. Remove it from the private data. Tidy up the initialization of the other phy_iobase variables. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 7599053df807..cfcde124143d 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -1080,7 +1080,6 @@ struct ext_clock_info { /* this structure is for data unique to this hardware driver. */ struct pcidas64_private { /* base addresses (physical) */ - resource_size_t plx9080_phys_iobase; resource_size_t main_phys_iobase; resource_size_t dio_counter_phys_iobase; /* base addresses (ioremapped) */ @@ -4053,13 +4052,8 @@ static int auto_attach(struct comedi_device *dev, /* Initialize dev->board_name */ dev->board_name = thisboard->name; - dev->iobase = pci_resource_start(pcidev, 2); - - devpriv->plx9080_phys_iobase = - pci_resource_start(pcidev, 0); - devpriv->main_phys_iobase = dev->iobase; - devpriv->dio_counter_phys_iobase = - pci_resource_start(pcidev, 3); + devpriv->main_phys_iobase = pci_resource_start(pcidev, 2); + devpriv->dio_counter_phys_iobase = pci_resource_start(pcidev, 3); devpriv->plx9080_iobase = pci_ioremap_bar(pcidev, 0); devpriv->main_iobase = pci_ioremap_bar(pcidev, 2);