s390/pci: remove iomap sanity checks

Since each iomap_entry handles only one bar of one pci function
(even when disjunct ranges of a bar are mapped) the sanity check
in pci_iomap_range is not needed and can be removed.

Also convert the remaining BUG_ONs to WARN_ONs.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index d28d194d580c..8f19c8f9d660 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -275,15 +275,10 @@ void __iomem *pci_iomap_range(struct pci_dev *pdev,
 
         idx = zdev->bars[bar].map_idx;
         spin_lock(&zpci_iomap_lock);
-        if (zpci_iomap_start[idx].count++) {
-                BUG_ON(zpci_iomap_start[idx].fh != zdev->fh ||
-                       zpci_iomap_start[idx].bar != bar);
-        } else {
-                zpci_iomap_start[idx].fh = zdev->fh;
-                zpci_iomap_start[idx].bar = bar;
-        }
         /* Detect overrun */
-        BUG_ON(!zpci_iomap_start[idx].count);
+        WARN_ON(!++zpci_iomap_start[idx].count);
+        zpci_iomap_start[idx].fh = zdev->fh;
+        zpci_iomap_start[idx].bar = bar;
         spin_unlock(&zpci_iomap_lock);
 
         return (void __iomem *) ZPCI_ADDR(idx) + offset;
@@ -302,7 +297,7 @@ void pci_iounmap(struct pci_dev *pdev, void __iomem *addr)
 
         spin_lock(&zpci_iomap_lock);
         /* Detect underrun */
-        BUG_ON(!zpci_iomap_start[idx].count);
+        WARN_ON(!zpci_iomap_start[idx].count);
         if (!--zpci_iomap_start[idx].count) {
                 zpci_iomap_start[idx].fh = 0;
                 zpci_iomap_start[idx].bar = 0;