brcm80211: update PCI config space define

- replaced sizeof(struct pci_config_regs) with exact size; removed
  struct
- cleaned up the rest of broadcom PCI specific defines

Signed-off-by: Stanislav Fomichev <kernel@fomichev.me>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 19 insertions, 52 deletions

diff --git a/drivers/staging/brcm80211/include/pcicfg.h b/drivers/staging/brcm80211/include/pcicfg.h
index eefcc04c34f6..d0c617a63c4f 100644
--- a/drivers/staging/brcm80211/include/pcicfg.h
+++ b/drivers/staging/brcm80211/include/pcicfg.h
@@ -19,65 +19,32 @@
 
 #include <linux/pci_regs.h>
 
-/* The actual config space */
-
-#define PCI_BAR_MAX             6
-
-#define PCR_RSVDA_MAX           2
-
-typedef struct _pci_config_regs {
-        u16 vendor;
-        u16 device;
-        u16 command;
-        u16 status;
-        u8 rev_id;
-        u8 prog_if;
-        u8 sub_class;
-        u8 base_class;
-        u8 cache_line_size;
-        u8 latency_timer;
-        u8 header_type;
-        u8 bist;
-        u32 base[PCI_BAR_MAX];
-        u32 cardbus_cis;
-        u16 subsys_vendor;
-        u16 subsys_id;
-        u32 baserom;
-        u32 rsvd_a[PCR_RSVDA_MAX];
-        u8 int_line;
-        u8 int_pin;
-        u8 min_gnt;
-        u8 max_lat;
-        u8 dev_dep[192];
-} pci_config_regs;
-
-#define SZPCR           (sizeof (pci_config_regs))
+/* PCI configuration address space size */
+#define PCI_SZPCR               256
 
 /* Everything below is BRCM HND proprietary */
 
 /* Brcm PCI configuration registers */
-#define PCI_BAR0_WIN            0x80    /* backplane address space accessed by BAR0 */
-#define PCI_SPROM_CONTROL       0x88    /* sprom property control */
-#define PCI_INT_MASK            0x94    /* mask of PCI and other cores interrupts */
-#define PCI_BAR0_WIN2           0xac    /* backplane address space accessed by second 4KB of BAR0 */
-#define PCI_GPIO_IN             0xb0    /* pci config space gpio input (>=rev3) */
-#define PCI_GPIO_OUT            0xb4    /* pci config space gpio output (>=rev3) */
-#define PCI_GPIO_OUTEN          0xb8    /* pci config space gpio output enable (>=rev3) */
-
-#define PCI_BAR0_SPROM_OFFSET   (4 * 1024)      /* bar0 + 4K accesses external sprom */
-#define PCI_BAR0_PCIREGS_OFFSET (6 * 1024)      /* bar0 + 6K accesses pci core registers */
-#define PCI_BAR0_PCISBR_OFFSET  (4 * 1024)      /* pci core SB registers are at the end of the
+#define PCI_BAR0_WIN            0x80    /* backplane address space accessed by BAR0 */
+#define PCI_SPROM_CONTROL       0x88    /* sprom property control */
+#define PCI_INT_MASK            0x94    /* mask of PCI and other cores interrupts */
+#define  PCI_SBIM_SHIFT         8       /* backplane core interrupt mask bits offset */
+#define PCI_BAR0_WIN2           0xac    /* backplane address space accessed by second 4KB of BAR0 */
+#define PCI_GPIO_IN             0xb0    /* pci config space gpio input (>=rev3) */
+#define PCI_GPIO_OUT            0xb4    /* pci config space gpio output (>=rev3) */
+#define PCI_GPIO_OUTEN          0xb8    /* pci config space gpio output enable (>=rev3) */
+
+#define PCI_BAR0_SPROM_OFFSET   (4 * 1024)      /* bar0 + 4K accesses external sprom */
+#define PCI_BAR0_PCIREGS_OFFSET (6 * 1024)      /* bar0 + 6K accesses pci core registers */
+#define PCI_BAR0_PCISBR_OFFSET  (4 * 1024)      /* pci core SB registers are at the end of the
                                                  * 8KB window, so their address is the "regular"
                                                  * address plus 4K
                                                  */
 #define PCI_BAR0_WINSZ          (16 * 1024)     /* bar0 window size Match with corerev 13 */
 /* On pci corerev >= 13 and all pcie, the bar0 is now 16KB and it maps: */
-#define PCI_16KB0_PCIREGS_OFFSET (8 * 1024)     /* bar0 + 8K accesses pci/pcie core registers */
-#define PCI_16KB0_CCREGS_OFFSET (12 * 1024)     /* bar0 + 12K accesses chipc core registers */
-
-#define PCI_SBIM_STATUS_SERR    0x4     /* backplane SBErr interrupt status */
+#define PCI_16KB0_PCIREGS_OFFSET (8 * 1024)     /* bar0 + 8K accesses pci/pcie core registers */
+#define PCI_16KB0_CCREGS_OFFSET (12 * 1024)     /* bar0 + 12K accesses chipc core registers */
 
-/* PCI_INT_MASK */
-#define PCI_SBIM_SHIFT          8       /* backplane core interrupt mask bits offset */
+#define PCI_SBIM_STATUS_SERR    0x4     /* backplane SBErr interrupt status */
 
 #endif                          /* _h_pcicfg_ */
diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c
index 9be55ea96b12..6eabbed5cd27 100644
--- a/drivers/staging/brcm80211/util/nicpci.c
+++ b/drivers/staging/brcm80211/util/nicpci.c
@@ -166,8 +166,8 @@ pcicore_find_pci_capability(void *dev, u8 req_cap_id,
                 *buflen = 0;
                 /* copy the cpability data excluding cap ID and next ptr */
                 cap_data = cap_ptr + 2;
-                if ((bufsize + cap_data) > SZPCR)
-                        bufsize = SZPCR - cap_data;
+                if ((bufsize + cap_data) > PCI_SZPCR)
+                        bufsize = PCI_SZPCR - cap_data;
                 *buflen = bufsize;
                 while (bufsize--) {
                         pci_read_config_byte(dev, cap_data, buf);