Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
alpha: Remove set but unused variables.
This is a new warning in gcc 4.6. Several of these variables are
used within #if 0 code, which probably ought to be removed. Most
of the changes are legitimate cleanups.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by
Richard Henderson
and committed by
Linus Torvalds
280da4e4
90fd30c9
+13
-17
+5
-7
arch/alpha/kernel/core_mcpcia.c
+5
-7
arch/alpha/kernel/core_mcpcia.c
···
88
88
{
89
89
unsigned long flags;
90
90
unsigned long mid = MCPCIA_HOSE2MID(hose->index);
91
-
unsigned int stat0, value, temp, cpu;
91
+
unsigned int stat0, value, cpu;
92
92
93
93
cpu = smp_processor_id();
94
94
···
101
101
stat0 = *(vuip)MCPCIA_CAP_ERR(mid);
102
102
*(vuip)MCPCIA_CAP_ERR(mid) = stat0;
103
103
mb();
104
-
temp = *(vuip)MCPCIA_CAP_ERR(mid);
104
+
*(vuip)MCPCIA_CAP_ERR(mid);
105
105
DBG_CFG(("conf_read: MCPCIA_CAP_ERR(%d) was 0x%x\n", mid, stat0));
106
106
107
107
mb();
···
136
136
{
137
137
unsigned long flags;
138
138
unsigned long mid = MCPCIA_HOSE2MID(hose->index);
139
-
unsigned int stat0, temp, cpu;
139
+
unsigned int stat0, cpu;
140
140
141
141
cpu = smp_processor_id();
142
142
···
145
145
/* Reset status register to avoid losing errors. */
146
146
stat0 = *(vuip)MCPCIA_CAP_ERR(mid);
147
147
*(vuip)MCPCIA_CAP_ERR(mid) = stat0; mb();
148
-
temp = *(vuip)MCPCIA_CAP_ERR(mid);
148
+
*(vuip)MCPCIA_CAP_ERR(mid);
149
149
DBG_CFG(("conf_write: MCPCIA CAP_ERR(%d) was 0x%x\n", mid, stat0));
150
150
151
151
draina();
···
157
157
*((vuip)addr) = value;
158
158
mb();
159
159
mb(); /* magic */
160
-
temp = *(vuip)MCPCIA_CAP_ERR(mid); /* read to force the write */
160
+
*(vuip)MCPCIA_CAP_ERR(mid); /* read to force the write */
161
161
mcheck_expected(cpu) = 0;
162
162
mb();
163
163
···
572
572
void
573
573
mcpcia_machine_check(unsigned long vector, unsigned long la_ptr)
574
574
{
575
-
struct el_common *mchk_header;
576
575
struct el_MCPCIA_uncorrected_frame_mcheck *mchk_logout;
577
576
unsigned int cpu = smp_processor_id();
578
577
int expected;
579
578
580
-
mchk_header = (struct el_common *)la_ptr;
581
579
mchk_logout = (struct el_MCPCIA_uncorrected_frame_mcheck *)la_ptr;
582
580
expected = mcheck_expected(cpu);
583
581
+1
-3
arch/alpha/kernel/err_titan.c
+1
-3
arch/alpha/kernel/err_titan.c
···
533
533
static struct el_subpacket *
534
534
el_process_regatta_subpacket(struct el_subpacket *header)
535
535
{
536
-
int status;
537
-
538
536
if (header->class != EL_CLASS__REGATTA_FAMILY) {
539
537
printk("%s ** Unexpected header CLASS %d TYPE %d, aborting\n",
540
538
err_print_prefix,
···
549
551
printk("%s ** Occurred on CPU %d:\n",
550
552
err_print_prefix,
551
553
(int)header->by_type.regatta_frame.cpuid);
552
-
status = privateer_process_logout_frame((struct el_common *)
554
+
privateer_process_logout_frame((struct el_common *)
553
555
header->by_type.regatta_frame.data_start, 1);
554
556
break;
555
557
default:
+3
-3
arch/alpha/kernel/setup.c
+3
-3
arch/alpha/kernel/setup.c
···
1404
1404
case PCA56_CPU:
1405
1405
case PCA57_CPU:
1406
1406
{
1407
-
unsigned long cbox_config, size;
1408
-
1409
1407
if (cpu_type == PCA56_CPU) {
1410
1408
L1I = CSHAPE(16*1024, 6, 1);
1411
1409
L1D = CSHAPE(8*1024, 5, 1);
···
1413
1415
}
1414
1416
L3 = -1;
1415
1417
1418
+
#if 0
1419
+
unsigned long cbox_config, size;
1420
+
1416
1421
cbox_config = *(vulp) phys_to_virt (0xfffff00008UL);
1417
1422
size = 512*1024 * (1 << ((cbox_config >> 12) & 3));
1418
1423
1419
-
#if 0
1420
1424
L2 = ((cbox_config >> 31) & 1 ? CSHAPE (size, 6, 1) : -1);
1421
1425
#else
1422
1426
L2 = external_cache_probe(512*1024, 6);
+1
-2
arch/alpha/kernel/smc37c93x.c
+1
-2
arch/alpha/kernel/smc37c93x.c
···
79
79
static unsigned long __init SMCConfigState(unsigned long baseAddr)
80
80
{
81
81
unsigned char devId;
82
-
unsigned char devRev;
83
82
84
83
unsigned long configPort;
85
84
unsigned long indexPort;
···
99
100
devId = inb(dataPort);
100
101
if (devId == VALID_DEVICE_ID) {
101
102
outb(DEVICE_REV, indexPort);
102
-
devRev = inb(dataPort);
103
+
/* unsigned char devRev = */ inb(dataPort);
103
104
break;
104
105
}
105
106
else
+3
-2
arch/alpha/kernel/sys_wildfire.c
+3
-2
arch/alpha/kernel/sys_wildfire.c
···
156
156
wildfire_init_irq_per_pca(int qbbno, int pcano)
157
157
{
158
158
int i, irq_bias;
159
-
unsigned long io_bias;
160
159
static struct irqaction isa_enable = {
161
160
.handler = no_action,
162
161
.name = "isa_enable",
···
164
165
irq_bias = qbbno * (WILDFIRE_PCA_PER_QBB * WILDFIRE_IRQ_PER_PCA)
165
166
+ pcano * WILDFIRE_IRQ_PER_PCA;
166
167
168
+
#if 0
169
+
unsigned long io_bias;
170
+
167
171
/* Only need the following for first PCI bus per PCA. */
168
172
io_bias = WILDFIRE_IO(qbbno, pcano<<1) - WILDFIRE_IO_BIAS;
169
173
170
-
#if 0
171
174
outb(0, DMA1_RESET_REG + io_bias);
172
175
outb(0, DMA2_RESET_REG + io_bias);
173
176
outb(DMA_MODE_CASCADE, DMA2_MODE_REG + io_bias);