Skip to content

Commit 9c2ca10

Browse files
committed
parisc: iosapic: Convert I/O Sapic driver to use arch_initcall()
Signed-off-by: Helge Deller <[email protected]>
1 parent 53861a9 commit 9c2ca10

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

arch/parisc/include/asm/processor.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ extern int show_cpuinfo (struct seq_file *m, void *v);
314314

315315
/* driver code in driver/parisc */
316316
extern void processor_init(void);
317-
extern void iosapic_init(void);
318317
struct parisc_device;
319318
struct resource;
320319
extern void sba_distributed_lmmio(struct parisc_device *, struct resource *);

arch/parisc/kernel/setup.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,6 @@ static int __init parisc_init(void)
278278

279279
apply_alternatives_all();
280280
parisc_setup_cache_timing();
281-
282-
/* These are in a non-obvious order, will fix when we have an iotree */
283-
#if defined(CONFIG_IOSAPIC)
284-
iosapic_init();
285-
#endif
286281
return 0;
287282
}
288283
arch_initcall(parisc_init);

drivers/parisc/iosapic.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,13 +348,10 @@ iosapic_load_irt(unsigned long cell_num, struct irt_entry **irt)
348348
}
349349

350350

351-
352-
void __init iosapic_init(void)
351+
static int __init iosapic_init(void)
353352
{
354353
unsigned long cell = 0;
355354

356-
DBG("iosapic_init()\n");
357-
358355
#ifdef __LP64__
359356
if (is_pdc_pat()) {
360357
int status;
@@ -371,7 +368,10 @@ void __init iosapic_init(void)
371368
irt_num_entry = iosapic_load_irt(cell, &irt_cell);
372369
if (irt_num_entry == 0)
373370
irt_cell = NULL; /* old PDC w/o iosapic */
371+
372+
return 0;
374373
}
374+
arch_initcall(iosapic_init);
375375

376376

377377
/*

0 commit comments

Comments
 (0)