From: Julien Grall Date: Fri, 11 Dec 2015 15:28:20 +0000 (+0000) Subject: xen/arm: io: handle_read: Use a local variable to store dabt X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=efeedfa0eeec687a5df96c575160c33caeb6b31f;p=people%2Fliuw%2Flibxenctrl-split%2Fxen.git xen/arm: io: handle_read: Use a local variable to store dabt Rather than getting dabt every time through info->dabt, introduce a local variable and use it. Also fix a coding style error in the if condition. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c index de5765aa9d..7e299438ee 100644 --- a/xen/arch/arm/io.c +++ b/xen/arch/arm/io.c @@ -26,7 +26,8 @@ static int handle_read(const struct mmio_handler *handler, struct vcpu *v, mmio_info_t *info, register_t *r) { - uint8_t size = (1 << info->dabt.size) * 8; + const struct hsr_dabt dabt = info->dabt; + uint8_t size = (1 << dabt.size) * 8; if ( !handler->ops->read(v, info, r, handler->priv) ) return 0; @@ -36,7 +37,7 @@ static int handle_read(const struct mmio_handler *handler, struct vcpu *v, * Note that we expect the read handler to have zeroed the bits * outside the requested access size. */ - if ( info->dabt.sign && (*r & (1UL << (size - 1)) )) + if ( dabt.sign && (*r & (1UL << (size - 1))) ) { /* * We are relying on register_t using the same as