From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Fri, 1 Aug 2014 20:07:02 +0000 (-0700)
Subject: staging: comedi: amplc_dio200_pci: remove 'mainsize' from PCI boardinfo
X-Git-Tag: firefly_0821_release~176^2~3121^2~1372
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e2dfb515764dcaf156bd06af998842afe19bd337;p=firefly-linux-kernel-4.4.55.git

staging: comedi: amplc_dio200_pci: remove 'mainsize' from PCI boardinfo

The 'mainsize' member in the boardinfo for the DIO200 PCI boards is only used
for a sanity check of the pci_resource_len(). This sanity check is not needed.

Remove the sanity check along with the 'mainsize' values in the boardinfo.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/amplc_dio200.h b/drivers/staging/comedi/drivers/amplc_dio200.h
index 226ce8438ad1..f8d4d6fbf418 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200.h
+++ b/drivers/staging/comedi/drivers/amplc_dio200.h
@@ -23,10 +23,6 @@
 #ifndef AMPLC_DIO200_H_INCLUDED
 #define AMPLC_DIO200_H_INCLUDED
 
-/* 200 series register area sizes */
-#define DIO200_IO_SIZE		0x20
-#define DIO200_PCIE_IO_SIZE	0x4000
-
 /*
  * Subdevice types.
  */
diff --git a/drivers/staging/comedi/drivers/amplc_dio200_pci.c b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
index e1e62a3fd419..c69a43176173 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200_pci.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200_pci.c
@@ -244,7 +244,6 @@ static const struct dio200_board dio200_pci_boards[] = {
 	[pci215_model] = {
 		.name = "pci215",
 		.mainbar = 2,
-		.mainsize = DIO200_IO_SIZE,
 		.layout = {
 			.n_subdevs = 5,
 			.sdtype = {sd_8255, sd_8255, sd_8254, sd_8254, sd_intr},
@@ -256,7 +255,6 @@ static const struct dio200_board dio200_pci_boards[] = {
 	[pci272_model] = {
 		.name = "pci272",
 		.mainbar = 2,
-		.mainsize = DIO200_IO_SIZE,
 		.layout = {
 			.n_subdevs = 4,
 			.sdtype = {sd_8255, sd_8255, sd_8255, sd_intr},
@@ -268,7 +266,6 @@ static const struct dio200_board dio200_pci_boards[] = {
 		.name = "pcie215",
 		.mainbar = 1,
 		.mainshift = 3,
-		.mainsize = DIO200_PCIE_IO_SIZE,
 		.layout = {
 			.n_subdevs = 8,
 			.sdtype = {sd_8255, sd_none, sd_8255, sd_none,
@@ -284,7 +281,6 @@ static const struct dio200_board dio200_pci_boards[] = {
 		.name = "pcie236",
 		.mainbar = 1,
 		.mainshift = 3,
-		.mainsize = DIO200_PCIE_IO_SIZE,
 		.layout = {
 			.n_subdevs = 8,
 			.sdtype = {sd_8255, sd_none, sd_none, sd_none,
@@ -300,7 +296,6 @@ static const struct dio200_board dio200_pci_boards[] = {
 		.name = "pcie296",
 		.mainbar = 1,
 		.mainshift = 3,
-		.mainsize = DIO200_PCIE_IO_SIZE,
 		.layout = {
 			.n_subdevs = 8,
 			.sdtype = {sd_8255, sd_8255, sd_8255, sd_8255,
@@ -372,10 +367,6 @@ static int dio200_pci_auto_attach(struct comedi_device *dev,
 		return ret;
 
 	bar = thisboard->mainbar;
-	if (pci_resource_len(pci_dev, bar) < thisboard->mainsize) {
-		dev_err(dev->class_dev, "error! PCI region size too small!\n");
-		return -EINVAL;
-	}
 	if (pci_resource_flags(pci_dev, bar) & IORESOURCE_MEM) {
 		dev->mmio = pci_ioremap_bar(pci_dev, bar);
 		if (!dev->mmio) {