From 22ed1d34789b184aaaa28c1e4620ce4467744cec Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sun, 25 Apr 2010 19:31:06 +0000 Subject: arm: remove dead assignments, spotted by clang analyzer Value stored is never read. Signed-off-by: Blue Swirl --- arm-dis.c | 1 - hw/omap1.c | 1 - hw/omap2.c | 2 +- hw/omap_sx1.c | 6 ++---- hw/palm.c | 3 +-- hw/pflash_cfi01.c | 2 ++ hw/pflash_cfi02.c | 2 ++ hw/sd.c | 8 ++------ hw/smc91c111.c | 35 ++++++++++++++++++----------------- hw/spitz.c | 2 +- hw/stellaris.c | 2 +- hw/tusb6010.c | 2 -- hw/wm8750.c | 5 ++--- target-arm/translate.c | 1 - 14 files changed, 32 insertions(+), 40 deletions(-) diff --git a/arm-dis.c b/arm-dis.c index 5028555..fe7ac99 100644 --- a/arm-dis.c +++ b/arm-dis.c @@ -2515,7 +2515,6 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb) { func (stream, "", bits, cmode, op); - size = 32; break; } switch (size) diff --git a/hw/omap1.c b/hw/omap1.c index a554d90..8649dbd 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -2348,7 +2348,6 @@ static void omap_clkm_write(void *opaque, target_phys_addr_t addr, return; case 0x0c: /* ARM_EWUPCT */ - diff = s->clkm.arm_ewupct ^ value; s->clkm.arm_ewupct = value & 0x003f; return; diff --git a/hw/omap2.c b/hw/omap2.c index a3fa89d..bd1b35e 100644 --- a/hw/omap2.c +++ b/hw/omap2.c @@ -1968,7 +1968,7 @@ struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta, s->irq = irq; s->codec.rxdrq = *drq ++; - s->codec.txdrq = *drq ++; + s->codec.txdrq = *drq; omap_eac_reset(s); #ifdef HAS_AUDIO diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c index 2a8419e..ca0a7d1 100644 --- a/hw/omap_sx1.c +++ b/hw/omap_sx1.c @@ -126,7 +126,6 @@ static void sx1_init(ram_addr_t ram_size, static uint32_t cs1val = 0x00215070; static uint32_t cs2val = 0x00001139; static uint32_t cs3val = 0x00001139; - ram_addr_t phys_flash; DriveInfo *dinfo; int fl_idx; uint32_t flash_size = flash0_size; @@ -140,7 +139,7 @@ static void sx1_init(ram_addr_t ram_size, /* External Flash (EMIFS) */ cpu_register_physical_memory(OMAP_CS0_BASE, flash_size, - (phys_flash = qemu_ram_alloc(flash_size)) | IO_MEM_ROM); + qemu_ram_alloc(flash_size) | IO_MEM_ROM); io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val); cpu_register_physical_memory(OMAP_CS0_BASE + flash_size, @@ -171,8 +170,7 @@ static void sx1_init(ram_addr_t ram_size, if ((version == 1) && (dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) { cpu_register_physical_memory(OMAP_CS1_BASE, flash1_size, - (phys_flash = qemu_ram_alloc(flash1_size)) | - IO_MEM_ROM); + qemu_ram_alloc(flash1_size) | IO_MEM_ROM); io = cpu_register_io_memory(static_readfn, static_writefn, &cs1val); cpu_register_physical_memory(OMAP_CS1_BASE + flash1_size, OMAP_CS1_SIZE - flash1_size, io); diff --git a/hw/palm.c b/hw/palm.c index 6d19167..ba7c398 100644 --- a/hw/palm.c +++ b/hw/palm.c @@ -206,7 +206,6 @@ static void palmte_init(ram_addr_t ram_size, static uint32_t cs1val = 0x0000e1a0; static uint32_t cs2val = 0x0000e1a0; static uint32_t cs3val = 0xe1a0e1a0; - ram_addr_t phys_flash; int rom_size, rom_loaded = 0; DisplayState *ds = get_displaystate(); @@ -214,7 +213,7 @@ static void palmte_init(ram_addr_t ram_size, /* External Flash (EMIFS) */ cpu_register_physical_memory(OMAP_CS0_BASE, flash_size, - (phys_flash = qemu_ram_alloc(flash_size)) | IO_MEM_ROM); + qemu_ram_alloc(flash_size) | IO_MEM_ROM); io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val); cpu_register_physical_memory(OMAP_CS0_BASE + flash_size, diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index 6b2adba..20fe93d 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -542,7 +542,9 @@ static int ctz32 (uint32_t n) } if (!(n & 0x1)) { ret++; +#if 0 /* This is not necessary as n is never 0 */ n = n >> 1; +#endif } #if 0 /* This is not necessary as n is never 0 */ if (!n) diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c index bd6397b..f3d3f41 100644 --- a/hw/pflash_cfi02.c +++ b/hw/pflash_cfi02.c @@ -582,7 +582,9 @@ static int ctz32 (uint32_t n) } if (!(n & 0x1)) { ret++; +#if 0 /* This is not necessary as n is never 0 */ n = n >> 1; +#endif } #if 0 /* This is not necessary as n is never 0 */ if (!n) diff --git a/hw/sd.c b/hw/sd.c index cc2839d..c928120 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -1143,12 +1143,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, } static sd_rsp_type_t sd_app_command(SDState *sd, - SDRequest req) { - uint32_t rca; - - if (sd_cmd_type[req.cmd] == sd_ac || sd_cmd_type[req.cmd] == sd_adtc) - rca = req.arg >> 16; - + SDRequest req) +{ DPRINTF("ACMD%d 0x%08x\n", req.cmd, req.arg); switch (req.cmd) { case 6: /* ACMD6: SET_BUS_WIDTH */ diff --git a/hw/smc91c111.c b/hw/smc91c111.c index e4a2447..f7d58e1 100644 --- a/hw/smc91c111.c +++ b/hw/smc91c111.c @@ -160,7 +160,6 @@ static void smc91c111_do_tx(smc91c111_state *s) int i; int len; int control; - int add_crc; int packetnum; uint8_t *p; @@ -187,20 +186,22 @@ static void smc91c111_do_tx(smc91c111_state *s) len = 64; } #if 0 - /* The card is supposed to append the CRC to the frame. However - none of the other network traffic has the CRC appended. - Suspect this is low level ethernet detail we don't need to worry - about. */ - add_crc = (control & 0x10) || (s->tcr & TCR_NOCRC) == 0; - if (add_crc) { - uint32_t crc; - - crc = crc32(~0, p, len); - memcpy(p + len, &crc, 4); - len += 4; + { + int add_crc; + + /* The card is supposed to append the CRC to the frame. + However none of the other network traffic has the CRC + appended. Suspect this is low level ethernet detail we + don't need to worry about. */ + add_crc = (control & 0x10) || (s->tcr & TCR_NOCRC) == 0; + if (add_crc) { + uint32_t crc; + + crc = crc32(~0, p, len); + memcpy(p + len, &crc, 4); + len += 4; + } } -#else - add_crc = 0; #endif if (s->ctr & CTR_AUTO_RELEASE) /* Race? */ @@ -670,14 +671,14 @@ static ssize_t smc91c111_receive(VLANClientState *nc, const uint8_t *buf, size_t *(p++) = crc & 0xff; crc >>= 8; *(p++) = crc & 0xff; crc >>= 8; *(p++) = crc & 0xff; crc >>= 8; - *(p++) = crc & 0xff; crc >>= 8; + *(p++) = crc & 0xff; } if (size & 1) { *(p++) = buf[size - 1]; - *(p++) = 0x60; + *p = 0x60; } else { *(p++) = 0; - *(p++) = 0x40; + *p = 0x40; } /* TODO: Raise early RX interrupt? */ s->int_level |= INT_RCV; diff --git a/hw/spitz.c b/hw/spitz.c index 564519b..c3b5cd8 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -721,7 +721,7 @@ static void spitz_ssp_attach(PXA2xxState *cpu) mux = ssi_create_slave(cpu->ssp[CORGI_SSP_PORT - 1], "corgi-ssp"); bus = qdev_get_child_bus(mux, "ssi0"); - dev = ssi_create_slave(bus, "spitz-lcdtg"); + ssi_create_slave(bus, "spitz-lcdtg"); bus = qdev_get_child_bus(mux, "ssi1"); dev = ssi_create_slave(bus, "ads7846"); diff --git a/hw/stellaris.c b/hw/stellaris.c index 44c9eee..5755f8a 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -1367,7 +1367,7 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, gpio_out[GPIO_D][0] = qdev_get_gpio_in(mux, 0); bus = qdev_get_child_bus(mux, "ssi0"); - dev = ssi_create_slave(bus, "ssi-sd"); + ssi_create_slave(bus, "ssi-sd"); bus = qdev_get_child_bus(mux, "ssi1"); dev = ssi_create_slave(bus, "ssd0323"); diff --git a/hw/tusb6010.c b/hw/tusb6010.c index 3887233..4864be5 100644 --- a/hw/tusb6010.c +++ b/hw/tusb6010.c @@ -425,7 +425,6 @@ static uint32_t tusb_async_readw(void *opaque, target_phys_addr_t addr) return s->rx_config[epnum]; case TUSB_EP_MAX_PACKET_SIZE_OFFSET ... (TUSB_EP_MAX_PACKET_SIZE_OFFSET + 0x3b): - epnum = (offset - TUSB_EP_MAX_PACKET_SIZE_OFFSET) >> 2; return 0x00000000; /* TODO */ case TUSB_WAIT_COUNT: return 0x00; /* TODO */ @@ -630,7 +629,6 @@ static void tusb_async_writew(void *opaque, target_phys_addr_t addr, break; case TUSB_EP_MAX_PACKET_SIZE_OFFSET ... (TUSB_EP_MAX_PACKET_SIZE_OFFSET + 0x3b): - epnum = (offset - TUSB_EP_MAX_PACKET_SIZE_OFFSET) >> 2; return; /* TODO */ case TUSB_WAIT_COUNT: return; /* TODO */ diff --git a/hw/wm8750.c b/hw/wm8750.c index 6064da0..ce43c23 100644 --- a/hw/wm8750.c +++ b/hw/wm8750.c @@ -62,12 +62,11 @@ static const uint8_t wm8750_vol_db_table[] = { static inline void wm8750_in_load(WM8750State *s) { - int acquired; if (s->idx_in + s->req_in <= sizeof(s->data_in)) return; s->idx_in = audio_MAX(0, (int) sizeof(s->data_in) - s->req_in); - acquired = AUD_read(*s->in[0], s->data_in + s->idx_in, - sizeof(s->data_in) - s->idx_in); + AUD_read(*s->in[0], s->data_in + s->idx_in, + sizeof(s->data_in) - s->idx_in); } static inline void wm8750_out_flush(WM8750State *s) diff --git a/target-arm/translate.c b/target-arm/translate.c index 5c54919..0eccca5 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -5242,7 +5242,6 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn) if (!u) { /* Extract. */ imm = (insn >> 8) & 0xf; - count = q + 1; if (imm > 7 && !q) return 1; -- cgit v1.1