s390/pci: cleanup function names

Rename s390pci_xyz to zpci_xxz and set_irq_ctrl to zpci_set_irq_ctrl.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/s390/include/asm/pci_io.h b/arch/s390/include/asm/pci_io.h
index 83a9caa6ae53..d194d544d694 100644
--- a/arch/s390/include/asm/pci_io.h
+++ b/arch/s390/include/asm/pci_io.h
@@ -36,7 +36,7 @@ static inline RETTYPE zpci_read_##RETTYPE(const volatile void __iomem *addr)	\
         u64 data;                                                               \
         int rc;                                                                 \
                                                                                 \
-        rc = s390pci_load(&data, req, ZPCI_OFFSET(addr));                       \
+        rc = zpci_load(&data, req, ZPCI_OFFSET(addr));                          \
         if (rc)                                                                 \
                 data = -1ULL;                                                   \
         return (RETTYPE) data;                                                  \
@@ -50,7 +50,7 @@ static inline void zpci_write_##VALTYPE(VALTYPE val,				\
         u64 req = ZPCI_CREATE_REQ(entry->fh, entry->bar, LENGTH);               \
         u64 data = (VALTYPE) val;                                               \
                                                                                 \
-        s390pci_store(data, req, ZPCI_OFFSET(addr));                            \
+        zpci_store(data, req, ZPCI_OFFSET(addr));                               \
 }
 
 zpci_read(8, u64)
@@ -83,7 +83,7 @@ static inline int zpci_write_single(u64 req, const u64 *data, u64 offset, u8 len
                 val = 0;                /* let FW report error */
                 break;
         }
-        return s390pci_store(val, req, offset);
+        return zpci_store(val, req, offset);
 }
 
 static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)
@@ -91,7 +91,7 @@ static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)
         u64 data;
         int cc;
 
-        cc = s390pci_load(&data, req, offset);
+        cc = zpci_load(&data, req, offset);
         if (cc)
                 goto out;
 
@@ -115,7 +115,7 @@ out:
 
 static inline int zpci_write_block(u64 req, const u64 *data, u64 offset)
 {
-        return s390pci_store_block(data, req, offset);
+        return zpci_store_block(data, req, offset);
 }
 
 static inline u8 zpci_get_max_write_size(u64 src, u64 dst, int len, int max)