Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9389339f28c2f0a32ad5043a1fe05444a7f3e677

Authored by Martin Schwidefsky
1 parent a9a6f0341d
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 5 changed files with 28 additions and 28 deletions Side-by-side Diff

arch/s390/include/asm/pci_insn.h
Diff comments   View file @ 9389339
... ... @@ -79,12 +79,12 @@
79 79 } __packed;
80 80  
81 81  
82   -int s390pci_mod_fc(u64 req, struct zpci_fib *fib);
83   -int s390pci_refresh_trans(u64 fn, u64 addr, u64 range);
84   -int s390pci_load(u64 *data, u64 req, u64 offset);
85   -int s390pci_store(u64 data, u64 req, u64 offset);
86   -int s390pci_store_block(const u64 *data, u64 req, u64 offset);
87   -void set_irq_ctrl(u16 ctl, char *unused, u8 isc);
  82 +int zpci_mod_fc(u64 req, struct zpci_fib *fib);
  83 +int zpci_refresh_trans(u64 fn, u64 addr, u64 range);
  84 +int zpci_load(u64 *data, u64 req, u64 offset);
  85 +int zpci_store(u64 data, u64 req, u64 offset);
  86 +int zpci_store_block(const u64 *data, u64 req, u64 offset);
  87 +void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc);
88 88  
89 89 #endif
arch/s390/include/asm/pci_io.h
Diff comments   View file @ 9389339
... ... @@ -36,7 +36,7 @@
36 36 u64 data; \
37 37 int rc; \
38 38 \
39   - rc = s390pci_load(&data, req, ZPCI_OFFSET(addr)); \
  39 + rc = zpci_load(&data, req, ZPCI_OFFSET(addr)); \
40 40 if (rc) \
41 41 data = -1ULL; \
42 42 return (RETTYPE) data; \
... ... @@ -50,7 +50,7 @@
50 50 u64 req = ZPCI_CREATE_REQ(entry->fh, entry->bar, LENGTH); \
51 51 u64 data = (VALTYPE) val; \
52 52 \
53   - s390pci_store(data, req, ZPCI_OFFSET(addr)); \
  53 + zpci_store(data, req, ZPCI_OFFSET(addr)); \
54 54 }
55 55  
56 56 zpci_read(8, u64)
... ... @@ -83,7 +83,7 @@
83 83 val = 0; /* let FW report error */
84 84 break;
85 85 }
86   - return s390pci_store(val, req, offset);
  86 + return zpci_store(val, req, offset);
87 87 }
88 88  
89 89 static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)
... ... @@ -91,7 +91,7 @@
91 91 u64 data;
92 92 int cc;
93 93  
94   - cc = s390pci_load(&data, req, offset);
  94 + cc = zpci_load(&data, req, offset);
95 95 if (cc)
96 96 goto out;
97 97  
... ... @@ -115,7 +115,7 @@
115 115  
116 116 static inline int zpci_write_block(u64 req, const u64 *data, u64 offset)
117 117 {
118   - return s390pci_store_block(data, req, offset);
  118 + return zpci_store_block(data, req, offset);
119 119 }
120 120  
121 121 static inline u8 zpci_get_max_write_size(u64 src, u64 dst, int len, int max)
... ... @@ -179,7 +179,7 @@
179 179 fib->aisb = (u64) bucket->aisb + aisb / 8;
180 180 fib->aisbo = aisb & ZPCI_MSI_MASK;
181 181  
182   - rc = s390pci_mod_fc(req, fib);
  182 + rc = zpci_mod_fc(req, fib);
183 183 pr_debug("%s mpcifc returned noi: %d\n", __func__, fib->noi);
184 184  
185 185 free_page((unsigned long) fib);
... ... @@ -209,7 +209,7 @@
209 209 fib->iota = args->iota;
210 210 fib->fmb_addr = args->fmb_addr;
211 211  
212   - rc = s390pci_mod_fc(req, fib);
  212 + rc = zpci_mod_fc(req, fib);
213 213 free_page((unsigned long) fib);
214 214 return rc;
215 215 }
... ... @@ -283,7 +283,7 @@
283 283 u64 data;
284 284 int rc;
285 285  
286   - rc = s390pci_load(&data, req, offset);
  286 + rc = zpci_load(&data, req, offset);
287 287 if (!rc) {
288 288 data = data << ((8 - len) * 8);
289 289 data = le64_to_cpu(data);
... ... @@ -301,7 +301,7 @@
301 301  
302 302 data = cpu_to_le64(data);
303 303 data = data >> ((8 - len) * 8);
304   - rc = s390pci_store(data, req, offset);
  304 + rc = zpci_store(data, req, offset);
305 305 return rc;
306 306 }
307 307  
... ... @@ -448,7 +448,7 @@
448 448 }
449 449  
450 450 /* enable interrupts again */
451   - set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
  451 + zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
452 452  
453 453 /* check again to not lose initiative */
454 454 rmb();
... ... @@ -727,7 +727,7 @@
727 727 per_cpu(next_sbit, cpu) = 0;
728 728  
729 729 spin_lock_init(&bucket->lock);
730   - set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
  730 + zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
731 731 return 0;
732 732  
733 733 out_ai:
arch/s390/pci/pci_dma.c
Diff comments   View file @ 9389339
... ... @@ -170,8 +170,8 @@
170 170 */
171 171 goto no_refresh;
172 172  
173   - rc = s390pci_refresh_trans((u64) zdev->fh << 32, start_dma_addr,
174   - nr_pages * PAGE_SIZE);
  173 + rc = zpci_refresh_trans((u64) zdev->fh << 32, start_dma_addr,
  174 + nr_pages * PAGE_SIZE);
175 175  
176 176 no_refresh:
177 177 spin_unlock_irqrestore(&zdev->dma_table_lock, irq_flags);
arch/s390/pci/pci_insn.c
Diff comments   View file @ 9389339
... ... @@ -27,7 +27,7 @@
27 27 return cc;
28 28 }
29 29  
30   -int s390pci_mod_fc(u64 req, struct zpci_fib *fib)
  30 +int zpci_mod_fc(u64 req, struct zpci_fib *fib)
31 31 {
32 32 u8 cc, status;
33 33  
... ... @@ -61,7 +61,7 @@
61 61 return cc;
62 62 }
63 63  
64   -int s390pci_refresh_trans(u64 fn, u64 addr, u64 range)
  64 +int zpci_refresh_trans(u64 fn, u64 addr, u64 range)
65 65 {
66 66 u8 cc, status;
67 67  
... ... @@ -78,7 +78,7 @@
78 78 }
79 79  
80 80 /* Set Interruption Controls */
81   -void set_irq_ctrl(u16 ctl, char *unused, u8 isc)
  81 +void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc)
82 82 {
83 83 asm volatile (
84 84 " .insn rsy,0xeb00000000d1,%[ctl],%[isc],%[u]\n"
... ... @@ -109,7 +109,7 @@
109 109 return cc;
110 110 }
111 111  
112   -int s390pci_load(u64 *data, u64 req, u64 offset)
  112 +int zpci_load(u64 *data, u64 req, u64 offset)
113 113 {
114 114 u8 status;
115 115 int cc;
... ... @@ -125,7 +125,7 @@
125 125 __func__, cc, status, req, offset);
126 126 return (cc > 0) ? -EIO : cc;
127 127 }
128   -EXPORT_SYMBOL_GPL(s390pci_load);
  128 +EXPORT_SYMBOL_GPL(zpci_load);
129 129  
130 130 /* PCI Store */
131 131 static inline int __pcistg(u64 data, u64 req, u64 offset, u8 *status)
... ... @@ -147,7 +147,7 @@
147 147 return cc;
148 148 }
149 149  
150   -int s390pci_store(u64 data, u64 req, u64 offset)
  150 +int zpci_store(u64 data, u64 req, u64 offset)
151 151 {
152 152 u8 status;
153 153 int cc;
... ... @@ -163,7 +163,7 @@
163 163 __func__, cc, status, req, offset);
164 164 return (cc > 0) ? -EIO : cc;
165 165 }
166   -EXPORT_SYMBOL_GPL(s390pci_store);
  166 +EXPORT_SYMBOL_GPL(zpci_store);
167 167  
168 168 /* PCI Store Block */
169 169 static inline int __pcistb(const u64 *data, u64 req, u64 offset, u8 *status)
... ... @@ -183,7 +183,7 @@
183 183 return cc;
184 184 }
185 185  
186   -int s390pci_store_block(const u64 *data, u64 req, u64 offset)
  186 +int zpci_store_block(const u64 *data, u64 req, u64 offset)
187 187 {
188 188 u8 status;
189 189 int cc;
... ... @@ -199,5 +199,5 @@
199 199 __func__, cc, status, req, offset);
200 200 return (cc > 0) ? -EIO : cc;
201 201 }
202   -EXPORT_SYMBOL_GPL(s390pci_store_block);
  202 +EXPORT_SYMBOL_GPL(zpci_store_block);