mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
sparc64: refactor code in viohs.c
The sparc64 allmodconfig build broke due to enabling of the branch_tracer that does some very clever things with all if conditions. This caused my gcc 3.4.5 to be so confused that it emitted a warning: arch/sparc/kernel/viohs.c: In function `vio_control_pkt_engine': arch/sparc/kernel/viohs.c:335: warning: 'nver' might be used uninitialized in this function And with -Werror this broke the build. Refactor code so it: 1) becomes more readable 2) no longer emit a warning with the branch_tracer enabled Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b2c0805f77
commit
2eac5a0d3a
1 changed files with 4 additions and 2 deletions
|
@ -337,8 +337,10 @@ static int process_ver_nack(struct vio_driver_state *vio,
|
|||
viodbg(HS, "GOT VERSION NACK maj[%u] min[%u] devclass[%u]\n",
|
||||
pkt->major, pkt->minor, pkt->dev_class);
|
||||
|
||||
if ((pkt->major == 0 && pkt->minor == 0) ||
|
||||
!(nver = find_by_major(vio, pkt->major)))
|
||||
if (pkt->major == 0 && pkt->minor == 0)
|
||||
return handshake_failure(vio);
|
||||
nver = find_by_major(vio, pkt->major);
|
||||
if (!nver)
|
||||
return handshake_failure(vio);
|
||||
|
||||
if (send_version(vio, nver->major, nver->minor) < 0)
|
||||
|
|
Loading…
Reference in a new issue