Skip to content

Commit 22450e0

Browse files
committed
Merge tag 'pci-v4.14-fixes-6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas: "Move alpha PCI IRQ map/swizzle functions out of initdata to fix regression from PCI core IRQ mapping changes (Lorenzo Pieralisi)" * tag 'pci-v4.14-fixes-6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: alpha/PCI: Move pci_map_irq()/pci_swizzle() out of initdata
2 parents b35f0ca + 814eae5 commit 22450e0

17 files changed

+54
-54
lines changed

arch/alpha/kernel/sys_alcor.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ alcor_init_irq(void)
181181
* comes in on. This makes interrupt processing much easier.
182182
*/
183183

184-
static int __init
184+
static int
185185
alcor_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
186186
{
187-
static char irq_tab[7][5] __initdata = {
187+
static char irq_tab[7][5] = {
188188
/*INT INTA INTB INTC INTD */
189189
/* note: IDSEL 17 is XLT only */
190190
{16+13, 16+13, 16+13, 16+13, 16+13}, /* IdSel 17, TULIP */

arch/alpha/kernel/sys_cabriolet.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ pc164_init_irq(void)
173173
* because it is the Saturn IO (SIO) PCI/ISA Bridge Chip.
174174
*/
175175

176-
static inline int __init
176+
static inline int
177177
eb66p_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
178178
{
179-
static char irq_tab[5][5] __initdata = {
179+
static char irq_tab[5][5] = {
180180
/*INT INTA INTB INTC INTD */
181181
{16+0, 16+0, 16+5, 16+9, 16+13}, /* IdSel 6, slot 0, J25 */
182182
{16+1, 16+1, 16+6, 16+10, 16+14}, /* IdSel 7, slot 1, J26 */
@@ -203,10 +203,10 @@ eb66p_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
203203
* because it is the Saturn IO (SIO) PCI/ISA Bridge Chip.
204204
*/
205205

206-
static inline int __init
206+
static inline int
207207
cabriolet_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
208208
{
209-
static char irq_tab[5][5] __initdata = {
209+
static char irq_tab[5][5] = {
210210
/*INT INTA INTB INTC INTD */
211211
{ 16+2, 16+2, 16+7, 16+11, 16+15}, /* IdSel 5, slot 2, J21 */
212212
{ 16+0, 16+0, 16+5, 16+9, 16+13}, /* IdSel 6, slot 0, J19 */
@@ -287,10 +287,10 @@ cia_cab_init_pci(void)
287287
*
288288
*/
289289

290-
static inline int __init
290+
static inline int
291291
alphapc164_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
292292
{
293-
static char irq_tab[7][5] __initdata = {
293+
static char irq_tab[7][5] = {
294294
/*INT INTA INTB INTC INTD */
295295
{ 16+2, 16+2, 16+9, 16+13, 16+17}, /* IdSel 5, slot 2, J20 */
296296
{ 16+0, 16+0, 16+7, 16+11, 16+15}, /* IdSel 6, slot 0, J29 */

arch/alpha/kernel/sys_dp264.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ clipper_init_irq(void)
356356
* 10 64 bit PCI option slot 3 (not bus 0)
357357
*/
358358

359-
static int __init
359+
static int
360360
isa_irq_fixup(const struct pci_dev *dev, int irq)
361361
{
362362
u8 irq8;
@@ -372,10 +372,10 @@ isa_irq_fixup(const struct pci_dev *dev, int irq)
372372
return irq8 & 0xf;
373373
}
374374

375-
static int __init
375+
static int
376376
dp264_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
377377
{
378-
static char irq_tab[6][5] __initdata = {
378+
static char irq_tab[6][5] = {
379379
/*INT INTA INTB INTC INTD */
380380
{ -1, -1, -1, -1, -1}, /* IdSel 5 ISA Bridge */
381381
{ 16+ 3, 16+ 3, 16+ 2, 16+ 2, 16+ 2}, /* IdSel 6 SCSI builtin*/
@@ -394,10 +394,10 @@ dp264_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
394394
return isa_irq_fixup(dev, irq);
395395
}
396396

397-
static int __init
397+
static int
398398
monet_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
399399
{
400-
static char irq_tab[13][5] __initdata = {
400+
static char irq_tab[13][5] = {
401401
/*INT INTA INTB INTC INTD */
402402
{ 45, 45, 45, 45, 45}, /* IdSel 3 21143 PCI1 */
403403
{ -1, -1, -1, -1, -1}, /* IdSel 4 unused */
@@ -423,7 +423,7 @@ monet_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
423423
return isa_irq_fixup(dev, COMMON_TABLE_LOOKUP);
424424
}
425425

426-
static u8 __init
426+
static u8
427427
monet_swizzle(struct pci_dev *dev, u8 *pinp)
428428
{
429429
struct pci_controller *hose = dev->sysdata;
@@ -456,10 +456,10 @@ monet_swizzle(struct pci_dev *dev, u8 *pinp)
456456
return slot;
457457
}
458458

459-
static int __init
459+
static int
460460
webbrick_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
461461
{
462-
static char irq_tab[13][5] __initdata = {
462+
static char irq_tab[13][5] = {
463463
/*INT INTA INTB INTC INTD */
464464
{ -1, -1, -1, -1, -1}, /* IdSel 7 ISA Bridge */
465465
{ -1, -1, -1, -1, -1}, /* IdSel 8 unused */
@@ -478,10 +478,10 @@ webbrick_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
478478
return isa_irq_fixup(dev, COMMON_TABLE_LOOKUP);
479479
}
480480

481-
static int __init
481+
static int
482482
clipper_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
483483
{
484-
static char irq_tab[7][5] __initdata = {
484+
static char irq_tab[7][5] = {
485485
/*INT INTA INTB INTC INTD */
486486
{ 16+ 8, 16+ 8, 16+ 9, 16+10, 16+11}, /* IdSel 1 slot 1 */
487487
{ 16+12, 16+12, 16+13, 16+14, 16+15}, /* IdSel 2 slot 2 */

arch/alpha/kernel/sys_eb64p.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ eb64p_init_irq(void)
167167
* comes in on. This makes interrupt processing much easier.
168168
*/
169169

170-
static int __init
170+
static int
171171
eb64p_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
172172
{
173-
static char irq_tab[5][5] __initdata = {
173+
static char irq_tab[5][5] = {
174174
/*INT INTA INTB INTC INTD */
175175
{16+7, 16+7, 16+7, 16+7, 16+7}, /* IdSel 5, slot ?, ?? */
176176
{16+0, 16+0, 16+2, 16+4, 16+9}, /* IdSel 6, slot ?, ?? */

arch/alpha/kernel/sys_eiger.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ eiger_init_irq(void)
141141
}
142142
}
143143

144-
static int __init
144+
static int
145145
eiger_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
146146
{
147147
u8 irq_orig;
@@ -158,7 +158,7 @@ eiger_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
158158
return irq_orig - 0x80;
159159
}
160160

161-
static u8 __init
161+
static u8
162162
eiger_swizzle(struct pci_dev *dev, u8 *pinp)
163163
{
164164
struct pci_controller *hose = dev->sysdata;

arch/alpha/kernel/sys_miata.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ miata_init_irq(void)
149149
* comes in on. This makes interrupt processing much easier.
150150
*/
151151

152-
static int __init
152+
static int
153153
miata_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
154154
{
155-
static char irq_tab[18][5] __initdata = {
155+
static char irq_tab[18][5] = {
156156
/*INT INTA INTB INTC INTD */
157157
{16+ 8, 16+ 8, 16+ 8, 16+ 8, 16+ 8}, /* IdSel 14, DC21142 */
158158
{ -1, -1, -1, -1, -1}, /* IdSel 15, EIDE */
@@ -196,7 +196,7 @@ miata_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
196196
return COMMON_TABLE_LOOKUP;
197197
}
198198

199-
static u8 __init
199+
static u8
200200
miata_swizzle(struct pci_dev *dev, u8 *pinp)
201201
{
202202
int slot, pin = *pinp;

arch/alpha/kernel/sys_mikasa.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ mikasa_init_irq(void)
145145
* comes in on. This makes interrupt processing much easier.
146146
*/
147147

148-
static int __init
148+
static int
149149
mikasa_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
150150
{
151-
static char irq_tab[8][5] __initdata = {
151+
static char irq_tab[8][5] = {
152152
/*INT INTA INTB INTC INTD */
153153
{16+12, 16+12, 16+12, 16+12, 16+12}, /* IdSel 17, SCSI */
154154
{ -1, -1, -1, -1, -1}, /* IdSel 18, PCEB */

arch/alpha/kernel/sys_nautilus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ nautilus_init_irq(void)
6262
common_init_isa_dma();
6363
}
6464

65-
static int __init
65+
static int
6666
nautilus_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
6767
{
6868
/* Preserve the IRQ set up by the console. */

arch/alpha/kernel/sys_noritake.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,10 @@ noritake_init_irq(void)
193193
* comes in on. This makes interrupt processing much easier.
194194
*/
195195

196-
static int __init
196+
static int
197197
noritake_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
198198
{
199-
static char irq_tab[15][5] __initdata = {
199+
static char irq_tab[15][5] = {
200200
/*INT INTA INTB INTC INTD */
201201
/* note: IDSELs 16, 17, and 25 are CORELLE only */
202202
{ 16+1, 16+1, 16+1, 16+1, 16+1}, /* IdSel 16, QLOGIC */
@@ -221,7 +221,7 @@ noritake_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
221221
return COMMON_TABLE_LOOKUP;
222222
}
223223

224-
static u8 __init
224+
static u8
225225
noritake_swizzle(struct pci_dev *dev, u8 *pinp)
226226
{
227227
int slot, pin = *pinp;

arch/alpha/kernel/sys_rawhide.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ rawhide_init_irq(void)
221221
*
222222
*/
223223

224-
static int __init
224+
static int
225225
rawhide_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
226226
{
227-
static char irq_tab[5][5] __initdata = {
227+
static char irq_tab[5][5] = {
228228
/*INT INTA INTB INTC INTD */
229229
{ 16+16, 16+16, 16+16, 16+16, 16+16}, /* IdSel 1 SCSI PCI 1 */
230230
{ 16+ 0, 16+ 0, 16+ 1, 16+ 2, 16+ 3}, /* IdSel 2 slot 2 */

0 commit comments

Comments
 (0)