@@ -338,14 +338,6 @@ enum bcr1_bits {
BCR1_MED1=0x80, /* for VT6102 */
};
-#ifdef USE_MMIO
-/* Registers we check that mmio and reg are the same. */
-static const int mmio_verify_registers[] = {
- RxConfig, TxConfig, IntrEnable, ConfigA, ConfigB, ConfigC, ConfigD,
- 0
-};
-#endif
-
/* Bits in the interrupt status/mask registers. */
enum intr_status_bits {
IntrRxDone = 0x0001,
@@ -659,6 +651,31 @@ static void enable_mmio(long pioaddr, u32 quirks)
outb(n, pioaddr + ConfigD);
}
}
+/* Check that selected MMIO registers match the PIO ones */
+static inline bool
+mmio_verify_registers(struct pci_dev *pdev, long pioaddr, void __iomem *ioaddr)
+{
+ /* Registers we check to verify that mmio and reg are the same. */
+ static const int registers_to_verify[] = {
+ RxConfig, TxConfig, IntrEnable,
+ ConfigA, ConfigB, ConfigC, ConfigD,
+ 0
+ };
+
+ int i = 0;
+ while (registers_to_verify[i]) {
+ int reg = registers_to_verify[i++];
+ unsigned char pio = inb(pioaddr+reg);
+ unsigned char mmio = readb(ioaddr+reg);
+ if (pio != mmio) {
+ dev_err(&pdev->dev,
+ "MMIO do not match PIO [%02x] (%02x != %02x)\n",
+ reg, mmio, pio);
+ return false;
+ }
+ }
+ return true;
+}
#endif
/*
@@ -969,19 +986,9 @@ static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
#ifdef USE_MMIO
enable_mmio(rp->pioaddr, rp->quirks);
- /* Check that selected MMIO registers match the PIO ones */
- i = 0;
- while (mmio_verify_registers[i]) {
- int reg = mmio_verify_registers[i++];
- unsigned char a = inb(pioaddr+reg);
- unsigned char b = readb(ioaddr+reg);
- if (a != b) {
- rc = -EIO;
- dev_err(&pdev->dev,
- "MMIO do not match PIO [%02x] (%02x != %02x)\n",
- reg, a, b);
- goto err_out_unmap;
- }
+ if (!mmio_verify_registers(pdev, pioaddr, ioaddr)) {
+ rc = -EIO;
+ goto err_out_unmap;
}
#endif /* USE_MMIO */