From ec3d4922dac4e365660e11a24a26a4457322caba Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 25 Sep 2006 16:57:42 -0700 Subject: [PATCH] --- yaml --- r: 38951 b: refs/heads/master c: 7b75b990e3cb33fd529640d589e77950e72a607c h: refs/heads/master i: 38949: 8288161673105131ac9c4342f40dababd41d9074 38947: fce249870c6944a78b73282bf162feec5e7b62b9 38943: f46590ff1360ecf502ec2fbd54acc19c87356cdc v: v3 --- [refs] | 2 +- trunk/drivers/scsi/aic7xxx/aic79xx_inline.h | 3 ++- trunk/drivers/scsi/aic7xxx/aic7xxx_inline.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 86170175781c..d4406686fd24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02a0fa676cd453ce4254c2eee838307ffc5c37f4 +refs/heads/master: 7b75b990e3cb33fd529640d589e77950e72a607c diff --git a/trunk/drivers/scsi/aic7xxx/aic79xx_inline.h b/trunk/drivers/scsi/aic7xxx/aic79xx_inline.h index 8ad3ce945b9e..a3266e066c00 100644 --- a/trunk/drivers/scsi/aic7xxx/aic79xx_inline.h +++ b/trunk/drivers/scsi/aic7xxx/aic79xx_inline.h @@ -527,7 +527,8 @@ ahd_inw(struct ahd_softc *ahd, u_int port) * or have other side effects when the low byte is * read. */ - return ((ahd_inb(ahd, port+1) << 8) | ahd_inb(ahd, port)); + uint16_t r = ahd_inb(ahd, port+1) << 8; + return r | ahd_inb(ahd, port); } static __inline void diff --git a/trunk/drivers/scsi/aic7xxx/aic7xxx_inline.h b/trunk/drivers/scsi/aic7xxx/aic7xxx_inline.h index 2cc8a17ed8b4..8e1954cdd84f 100644 --- a/trunk/drivers/scsi/aic7xxx/aic7xxx_inline.h +++ b/trunk/drivers/scsi/aic7xxx/aic7xxx_inline.h @@ -300,7 +300,8 @@ ahc_fetch_transinfo(struct ahc_softc *ahc, char channel, u_int our_id, static __inline uint16_t ahc_inw(struct ahc_softc *ahc, u_int port) { - return ((ahc_inb(ahc, port+1) << 8) | ahc_inb(ahc, port)); + uint16_t r = ahc_inb(ahc, port+1) << 8; + return r | ahc_inb(ahc, port); } static __inline void