Remove local definition GASKET_NUM_BARS for the number of PCI BARs and use
global one PCI_STD_NUM_BARS instead.

Cc: Rob Springer <rsprin...@google.com>
Cc: Todd Poynor <toddpoy...@google.com>
Cc: Ben Chan <benc...@chromium.org>
Signed-off-by: Denis Efremov <efre...@linux.com>
---
 drivers/staging/gasket/gasket_constants.h |  3 ---
 drivers/staging/gasket/gasket_core.c      | 12 ++++++------
 drivers/staging/gasket/gasket_core.h      |  4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/gasket/gasket_constants.h 
b/drivers/staging/gasket/gasket_constants.h
index 50d87c7b178c..9ea9c8833f27 100644
--- a/drivers/staging/gasket/gasket_constants.h
+++ b/drivers/staging/gasket/gasket_constants.h
@@ -13,9 +13,6 @@
 /* The maximum devices per each type. */
 #define GASKET_DEV_MAX 256
 
-/* The number of supported (and possible) PCI BARs. */
-#define GASKET_NUM_BARS 6
-
 /* The number of supported Gasket page tables per device. */
 #define GASKET_MAX_NUM_PAGE_TABLES 1
 
diff --git a/drivers/staging/gasket/gasket_core.c 
b/drivers/staging/gasket/gasket_core.c
index 13179f063a61..cd8be80d2076 100644
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -371,7 +371,7 @@ static int gasket_setup_pci(struct pci_dev *pci_dev,
 {
        int i, mapped_bars, ret;
 
-       for (i = 0; i < GASKET_NUM_BARS; i++) {
+       for (i = 0; i < PCI_STD_NUM_BARS; i++) {
                ret = gasket_map_pci_bar(gasket_dev, i);
                if (ret) {
                        mapped_bars = i;
@@ -393,7 +393,7 @@ static void gasket_cleanup_pci(struct gasket_dev 
*gasket_dev)
 {
        int i;
 
-       for (i = 0; i < GASKET_NUM_BARS; i++)
+       for (i = 0; i < PCI_STD_NUM_BARS; i++)
                gasket_unmap_pci_bar(gasket_dev, i);
 }
 
@@ -493,7 +493,7 @@ static ssize_t gasket_sysfs_data_show(struct device *device,
                (enum gasket_sysfs_attribute_type)gasket_attr->data.attr_type;
        switch (sysfs_type) {
        case ATTR_BAR_OFFSETS:
-               for (i = 0; i < GASKET_NUM_BARS; i++) {
+               for (i = 0; i < PCI_STD_NUM_BARS; i++) {
                        bar_desc = &driver_desc->bar_descriptions[i];
                        if (bar_desc->size == 0)
                                continue;
@@ -505,7 +505,7 @@ static ssize_t gasket_sysfs_data_show(struct device *device,
                }
                break;
        case ATTR_BAR_SIZES:
-               for (i = 0; i < GASKET_NUM_BARS; i++) {
+               for (i = 0; i < PCI_STD_NUM_BARS; i++) {
                        bar_desc = &driver_desc->bar_descriptions[i];
                        if (bar_desc->size == 0)
                                continue;
@@ -556,7 +556,7 @@ static ssize_t gasket_sysfs_data_show(struct device *device,
                ret = snprintf(buf, PAGE_SIZE, "%d\n", gasket_dev->reset_count);
                break;
        case ATTR_USER_MEM_RANGES:
-               for (i = 0; i < GASKET_NUM_BARS; ++i) {
+               for (i = 0; i < PCI_STD_NUM_BARS; ++i) {
                        current_written =
                                gasket_write_mappable_regions(buf, driver_desc,
                                                              i);
@@ -736,7 +736,7 @@ static int gasket_get_bar_index(const struct gasket_dev 
*gasket_dev,
        const struct gasket_driver_desc *driver_desc;
 
        driver_desc = gasket_dev->internal_desc->driver_desc;
-       for (i = 0; i < GASKET_NUM_BARS; ++i) {
+       for (i = 0; i < PCI_STD_NUM_BARS; ++i) {
                struct gasket_bar_desc bar_desc =
                        driver_desc->bar_descriptions[i];
 
diff --git a/drivers/staging/gasket/gasket_core.h 
b/drivers/staging/gasket/gasket_core.h
index be44ac1e3118..c417acadb0d5 100644
--- a/drivers/staging/gasket/gasket_core.h
+++ b/drivers/staging/gasket/gasket_core.h
@@ -268,7 +268,7 @@ struct gasket_dev {
        char kobj_name[GASKET_NAME_MAX];
 
        /* Virtual address of mapped BAR memory range. */
-       struct gasket_bar_data bar_data[GASKET_NUM_BARS];
+       struct gasket_bar_data bar_data[PCI_STD_NUM_BARS];
 
        /* Coherent buffer. */
        struct gasket_coherent_buffer coherent_buffer;
@@ -369,7 +369,7 @@ struct gasket_driver_desc {
        /* Set of 6 bar descriptions that describe all PCIe bars.
         * Note that BUS/AXI devices (i.e. non PCI devices) use those.
         */
-       struct gasket_bar_desc bar_descriptions[GASKET_NUM_BARS];
+       struct gasket_bar_desc bar_descriptions[PCI_STD_NUM_BARS];
 
        /*
         * Coherent buffer description.
-- 
2.21.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to