Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 7f74e79fe749da035cc150446f02aec29938a5c8

Authored by Stephen Rothwell
Committed by Linus Torvalds
1 parent 89ef68f0be
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] ppc64 iSeries: tidy up irq code after merge 

This patch just removes some dead code, fixes messages that referred to the
file this code used to be in and inserts XmPciLpEvent_init into its caller.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 18 additions and 35 deletions Side-by-side Diff

arch/ppc64/kernel/iSeries_irq.c
Diff comments   View file @ 7f74e79
... ... @@ -105,9 +105,6 @@
105 105 int irq;
106 106  
107 107 ++Pci_Interrupt_Count;
108   -#if 0
109   - PPCDBG(PPCDBG_BUSWALK, "PCI: XmPciLpEvent.c: intReceived\n");
110   -#endif
111 108  
112 109 switch (eventParm->hvLpEvent.xSubtype) {
113 110 case XmPciLpEvent_SlotInterrupt:
114 111  
115 112  
116 113  
117 114  
118 115  
... ... @@ -120,37 +117,37 @@
120 117 break;
121 118 /* Ignore error recovery events for now */
122 119 case XmPciLpEvent_BusCreated:
123   - printk(KERN_INFO "XmPciLpEvent.c: system bus %d created\n",
  120 + printk(KERN_INFO "intReceived: system bus %d created\n",
124 121 eventParm->eventData.busCreated.busNumber);
125 122 break;
126 123 case XmPciLpEvent_BusError:
127 124 case XmPciLpEvent_BusFailed:
128   - printk(KERN_INFO "XmPciLpEvent.c: system bus %d failed\n",
  125 + printk(KERN_INFO "intReceived: system bus %d failed\n",
129 126 eventParm->eventData.busFailed.busNumber);
130 127 break;
131 128 case XmPciLpEvent_BusRecovered:
132 129 case XmPciLpEvent_UnQuiesceBus:
133   - printk(KERN_INFO "XmPciLpEvent.c: system bus %d recovered\n",
  130 + printk(KERN_INFO "intReceived: system bus %d recovered\n",
134 131 eventParm->eventData.busRecovered.busNumber);
135 132 break;
136 133 case XmPciLpEvent_NodeFailed:
137 134 case XmPciLpEvent_BridgeError:
138 135 printk(KERN_INFO
139   - "XmPciLpEvent.c: multi-adapter bridge %d/%d/%d failed\n",
  136 + "intReceived: multi-adapter bridge %d/%d/%d failed\n",
140 137 eventParm->eventData.nodeFailed.busNumber,
141 138 eventParm->eventData.nodeFailed.subBusNumber,
142 139 eventParm->eventData.nodeFailed.deviceId);
143 140 break;
144 141 case XmPciLpEvent_NodeRecovered:
145 142 printk(KERN_INFO
146   - "XmPciLpEvent.c: multi-adapter bridge %d/%d/%d recovered\n",
  143 + "intReceived: multi-adapter bridge %d/%d/%d recovered\n",
147 144 eventParm->eventData.nodeRecovered.busNumber,
148 145 eventParm->eventData.nodeRecovered.subBusNumber,
149 146 eventParm->eventData.nodeRecovered.deviceId);
150 147 break;
151 148 default:
152 149 printk(KERN_ERR
153   - "XmPciLpEvent.c: unrecognized event subtype 0x%x\n",
  150 + "intReceived: unrecognized event subtype 0x%x\n",
154 151 eventParm->hvLpEvent.xSubtype);
155 152 break;
156 153 }
... ... @@ -160,10 +157,6 @@
160 157 struct pt_regs *regsParm)
161 158 {
162 159 #ifdef CONFIG_PCI
163   -#if 0
164   - PPCDBG(PPCDBG_BUSWALK, "XmPciLpEvent_handler, type 0x%x\n",
165   - eventParm->xType);
166   -#endif
167 160 ++Pci_Event_Count;
168 161  
169 162 if (eventParm && (eventParm->xType == HvLpEvent_Type_PciIo)) {
170 163  
171 164  
172 165  
173 166  
174 167  
175 168  
176 169  
177 170  
178 171  
... ... @@ -173,50 +166,42 @@
173 166 break;
174 167 case HvLpEvent_Function_Ack:
175 168 printk(KERN_ERR
176   - "XmPciLpEvent.c: unexpected ack received\n");
  169 + "XmPciLpEvent_handler: unexpected ack received\n");
177 170 break;
178 171 default:
179 172 printk(KERN_ERR
180   - "XmPciLpEvent.c: unexpected event function %d\n",
  173 + "XmPciLpEvent_handler: unexpected event function %d\n",
181 174 (int)eventParm->xFlags.xFunction);
182 175 break;
183 176 }
184 177 } else if (eventParm)
185 178 printk(KERN_ERR
186   - "XmPciLpEvent.c: Unrecognized PCI event type 0x%x\n",
  179 + "XmPciLpEvent_handler: Unrecognized PCI event type 0x%x\n",
187 180 (int)eventParm->xType);
188 181 else
189   - printk(KERN_ERR "XmPciLpEvent.c: NULL event received\n");
  182 + printk(KERN_ERR "XmPciLpEvent_handler: NULL event received\n");
190 183 #endif
191 184 }
192 185  
193   -/* This should be called sometime prior to buswalk (init_IRQ would be good) */
194   -int XmPciLpEvent_init()
  186 +/*
  187 + * This is called by init_IRQ. set in ppc_md.init_IRQ by iSeries_setup.c
  188 + * It must be called before the bus walk.
  189 + */
  190 +void __init iSeries_init_IRQ(void)
195 191 {
  192 + /* Register PCI event handler and open an event path */
196 193 int xRc;
197 194  
198   - PPCDBG(PPCDBG_BUSWALK,
199   - "XmPciLpEvent_init, Register Event type 0x%04X\n",
200   - HvLpEvent_Type_PciIo);
201   -
202 195 xRc = HvLpEvent_registerHandler(HvLpEvent_Type_PciIo,
203 196 &XmPciLpEvent_handler);
204 197 if (xRc == 0) {
205 198 xRc = HvLpEvent_openPath(HvLpEvent_Type_PciIo, 0);
206 199 if (xRc != 0)
207   - printk(KERN_ERR "XmPciLpEvent.c: open event path "
  200 + printk(KERN_ERR "iSeries_init_IRQ: open event path "
208 201 "failed with rc 0x%x\n", xRc);
209 202 } else
210   - printk(KERN_ERR "XmPciLpEvent.c: register handler "
  203 + printk(KERN_ERR "iSeries_init_IRQ: register handler "
211 204 "failed with rc 0x%x\n", xRc);
212   - return xRc;
213   -}
214   -
215   -/* This is called by init_IRQ. set in ppc_md.init_IRQ by iSeries_setup.c */
216   -void __init iSeries_init_IRQ(void)
217   -{
218   - /* Register PCI event handler and open an event path */
219   - XmPciLpEvent_init();
220 205 }
221 206  
222 207 #define REAL_IRQ_TO_BUS(irq) ((((irq) >> 6) & 0xff) + 1)
include/asm-ppc64/iSeries/iSeries_irq.h
Diff comments   View file @ 7f74e79
... ... @@ -5,7 +5,5 @@
5 5 extern int iSeries_allocate_IRQ(HvBusNumber, HvSubBusNumber, HvAgentId);
6 6 extern void iSeries_activate_IRQs(void);
7 7  
8   -extern int XmPciLpEvent_init(void);
9   -
10 8 #endif /* __ISERIES_IRQ_H__ */