Patchwork [2/2] ahci: delete write-only variables (v2)

login
register
mail settings
Submitter Blue Swirl
Date Dec. 18, 2010, 8 p.m.
Message ID <AANLkTinq+_1NimWOUfkX2j2Fd=A2UYCN=F5d0iVO-7zU@mail.gmail.com>
Download mbox | patch
Permalink /patch/76097/
State New
Headers show

Comments

Blue Swirl - Dec. 18, 2010, 8 p.m.
Avoid these warnings with GCC 4.6.0:
/src/qemu/hw/ide/ahci.c: In function 'ahci_reset_port':
/src/qemu/hw/ide/ahci.c:810:14: error: variable 'tfd' set but not used
[-Werror=unused-but-set-variable]
/src/qemu/hw/ide/ahci.c: In function 'handle_cmd':
/src/qemu/hw/ide/ahci.c:1103:19: error: variable 'pr' set but not used
[-Werror=unused-but-set-variable]

In the tfd variable case, fix the logic also.

CC: Alexander Graf <agraf@suse.de>
CC: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 hw/ide/ahci.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

     AHCICmdHdr *cmd;
@@ -1113,7 +1111,6 @@ static int handle_cmd(AHCIState *s, int port, int slot)
         return -1;
     }

-    pr = &s->dev[port].port_regs;
     cmd = &((AHCICmdHdr *)s->dev[port].lst)[slot];

     if (!s->dev[port].lst) {
Alexander Graf - Dec. 18, 2010, 8:10 p.m.
On 18.12.2010, at 21:00, Blue Swirl wrote:

> Avoid these warnings with GCC 4.6.0:
> /src/qemu/hw/ide/ahci.c: In function 'ahci_reset_port':
> /src/qemu/hw/ide/ahci.c:810:14: error: variable 'tfd' set but not used
> [-Werror=unused-but-set-variable]
> /src/qemu/hw/ide/ahci.c: In function 'handle_cmd':
> /src/qemu/hw/ide/ahci.c:1103:19: error: variable 'pr' set but not used
> [-Werror=unused-but-set-variable]
> 
> In the tfd variable case, fix the logic also.
> 
> CC: Alexander Graf <agraf@suse.de>
> CC: Kevin Wolf <kwolf@redhat.com>
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

Acked-by: Alexander Graf <agraf@suse.de>


Alex
Blue Swirl - Dec. 19, 2010, 10:47 a.m.
Thanks for the ack, applied.

On Sat, Dec 18, 2010 at 8:10 PM, Alexander Graf <agraf@suse.de> wrote:
>
> On 18.12.2010, at 21:00, Blue Swirl wrote:
>
>> Avoid these warnings with GCC 4.6.0:
>> /src/qemu/hw/ide/ahci.c: In function 'ahci_reset_port':
>> /src/qemu/hw/ide/ahci.c:810:14: error: variable 'tfd' set but not used
>> [-Werror=unused-but-set-variable]
>> /src/qemu/hw/ide/ahci.c: In function 'handle_cmd':
>> /src/qemu/hw/ide/ahci.c:1103:19: error: variable 'pr' set but not used
>> [-Werror=unused-but-set-variable]
>>
>> In the tfd variable case, fix the logic also.
>>
>> CC: Alexander Graf <agraf@suse.de>
>> CC: Kevin Wolf <kwolf@redhat.com>
>> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
>
> Acked-by: Alexander Graf <agraf@suse.de>
>
>
> Alex
>
>

Patch

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 8ae236a..968fdce 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -807,7 +807,6 @@  static void ahci_reset_port(AHCIState *s, int port)
     AHCIPortRegs *pr = &d->port_regs;
     IDEState *ide_state = &d->port.ifs[0];
     uint8_t init_fis[0x20];
-    uint32_t tfd;
     int i;

     DPRINTF(port, "reset port\n");
@@ -848,7 +847,7 @@  static void ahci_reset_port(AHCIState *s, int port)
     s->dev[port].port_state = STATE_RUN;
     if (!ide_state->bs) {
         s->dev[port].port_regs.sig = 0;
-        tfd = (1 << 8) | SEEK_STAT | WRERR_STAT;
+        ide_state->status = SEEK_STAT | WRERR_STAT;
     } else if (ide_state->drive_kind == IDE_CD) {
         s->dev[port].port_regs.sig = SATA_SIGNATURE_CDROM;
         ide_state->lcyl = 0x14;
@@ -1100,7 +1099,6 @@  static void process_ncq_command(AHCIState *s,
int port, uint8_t *cmd_fis,
 static int handle_cmd(AHCIState *s, int port, int slot)
 {
     IDEState *ide_state;
-    AHCIPortRegs *pr;
     uint32_t opts;
     uint64_t tbl_addr;