Skip to content

Commit

Permalink
staging: comedi: me4000: don't save the pci resource sizes
Browse files Browse the repository at this point in the history
There is no need to get the resource size for each pci bar. Nothing
in the driver uses it.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 8, 2012
1 parent ba98ab0 commit 0818dc0
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
4 changes: 0 additions & 4 deletions drivers/staging/comedi/drivers/me4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,6 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
"PCI base address 1 is not available\n", dev->minor);
return -ENODEV;
}
info->plx_regbase_size = pci_resource_len(pci_dev_p, 1);

/*--------------------------- me4000 regbase ----------------------------*/

Expand All @@ -403,7 +402,6 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
"PCI base address 2 is not available\n", dev->minor);
return -ENODEV;
}
info->me4000_regbase_size = pci_resource_len(pci_dev_p, 2);

/*--------------------------- timer regbase ------------------------------*/

Expand All @@ -414,7 +412,6 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
"PCI base address 3 is not available\n", dev->minor);
return -ENODEV;
}
info->timer_regbase_size = pci_resource_len(pci_dev_p, 3);

/*--------------------------- program regbase ----------------------------*/

Expand All @@ -425,7 +422,6 @@ static int get_registers(struct comedi_device *dev, struct pci_dev *pci_dev_p)
"PCI base address 5 is not available\n", dev->minor);
return -ENODEV;
}
info->program_regbase_size = pci_resource_len(pci_dev_p, 5);

return 0;
}
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/comedi/drivers/me4000.h
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,6 @@ struct me4000_info {
unsigned long timer_regbase; /* Base address of the timer circuit */
unsigned long program_regbase; /* Base address to set the program pin for the xilinx */

unsigned long plx_regbase_size; /* PLX register set space */
unsigned long me4000_regbase_size; /* ME4000 register set space */
unsigned long timer_regbase_size; /* Timer circuit register set space */
unsigned long program_regbase_size; /* Size of program base address of the ME4000 */

unsigned int serial_no; /* Serial number of the board */
unsigned char hw_revision; /* Hardware revision of the board */
unsigned short vendor_id; /* Meilhaus vendor id */
Expand Down

0 comments on commit 0818dc0

Please sign in to comment.