Skip to content

Commit

Permalink
sparc32,sun4d: drop unused code in sun4d_distribute_irqs()
Browse files Browse the repository at this point in the history
The preprocessor symbol was not defined and the code
was therefore not in use.

Signed-off-by: Sam Ravnborg <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
sravnborg authored and davem330 committed Mar 17, 2011
1 parent e54f854 commit a625a12
Showing 1 changed file with 0 additions and 47 deletions.
47 changes: 0 additions & 47 deletions arch/sparc/kernel/sun4d_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@
* have interrupts pending for that SBUS interrupt level.
*/

/*
* If you trust current SCSI layer to handle different
* SCSI IRQs, enable this.
* I don't trust it... -jj
*/
/* #define DISTRIBUTE_IRQS */

struct sun4d_timer_regs {
u32 l10_timer_limit;
u32 l10_cur_countx;
Expand Down Expand Up @@ -412,45 +405,6 @@ void __init sun4d_distribute_irqs(void)
{
struct device_node *dp;

#ifdef DISTRIBUTE_IRQS
cpumask_t sbus_serving_map;

sbus_serving_map = cpu_present_map;
for_each_node_by_name(dp, "sbi") {
int board = of_getintprop_default(dp, "board#", 0);

if ((board * 2) == boot_cpu_id && cpu_isset(board * 2 + 1, cpu_present_map))
sbus_tid[board] = (board * 2 + 1);
else if (cpu_isset(board * 2, cpu_present_map))
sbus_tid[board] = (board * 2);
else if (cpu_isset(board * 2 + 1, cpu_present_map))
sbus_tid[board] = (board * 2 + 1);
else
sbus_tid[board] = 0xff;
if (sbus_tid[board] != 0xff)
cpu_clear(sbus_tid[board], sbus_serving_map);
}
for_each_node_by_name(dp, "sbi") {
int board = of_getintprop_default(dp, "board#", 0);
if (sbus_tid[board] == 0xff) {
int i = 31;

if (cpus_empty(sbus_serving_map))
sbus_serving_map = cpu_present_map;
while (cpu_isset(i, sbus_serving_map))
i--;
sbus_tid[board] = i;
cpu_clear(i, sbus_serving_map);
}
}
for_each_node_by_name(dp, "sbi") {
int devid = of_getintprop_default(dp, "device-id", 0);
int board = of_getintprop_default(dp, "board#", 0);
printk(KERN_ERR "sbus%d IRQs directed to CPU%d\n",
board, sbus_tid[board]);
set_sbi_tid(devid, sbus_tid[board] << 3);
}
#else
int cpuid = cpu_logical_map(1);

if (cpuid == -1)
Expand All @@ -462,7 +416,6 @@ void __init sun4d_distribute_irqs(void)
set_sbi_tid(devid, cpuid << 3);
}
printk(KERN_ERR "All sbus IRQs directed to CPU%d\n", cpuid);
#endif
}
#endif

Expand Down

0 comments on commit a625a12

Please sign in to comment.