From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9caf-00037c-SC for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:43:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9cab-0005hC-LP for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:43:45 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:41580) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9cab-0005gn-BH for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:43:41 -0500 Received: from localhost by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 Dec 2015 17:43:40 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id E063E2190046 for ; Thu, 17 Dec 2015 17:43:28 +0000 (GMT) Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tBHHhbUK9765292 for ; Thu, 17 Dec 2015 17:43:37 GMT Received: from d06av02.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tBHHha7e027719 for ; Thu, 17 Dec 2015 10:43:36 -0700 From: Cornelia Huck Date: Thu, 17 Dec 2015 18:43:31 +0100 Message-Id: <1450374212-9841-6-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1450374212-9841-1-git-send-email-cornelia.huck@de.ibm.com> References: <1450374212-9841-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH 5/6] s390x/pci: code cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cornelia Huck , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, Yi Min Zhao , agraf@suse.de From: Yi Min Zhao Make use of the new FH_ENABLED define in existing code. Signed-off-by: Yi Min Zhao Reviewed-by: Cornelia Huck Signed-off-by: Cornelia Huck --- hw/s390x/s390-pci-inst.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index df57a7d..d521b2b 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -208,12 +208,12 @@ int clp_service_call(S390CPU *cpu, uint8_t r2) switch (reqsetpci->oc) { case CLP_SET_ENABLE_PCI_FN: - pbdev->fh = pbdev->fh | 1 << ENABLE_BIT_OFFSET; + pbdev->fh = pbdev->fh | FH_ENABLED; stl_p(&ressetpci->fh, pbdev->fh); stw_p(&ressetpci->hdr.rsp, CLP_RC_OK); break; case CLP_SET_DISABLE_PCI_FN: - pbdev->fh = pbdev->fh & ~(1 << ENABLE_BIT_OFFSET); + pbdev->fh = pbdev->fh & ~FH_ENABLED; pbdev->error_state = false; pbdev->lgstg_blocked = false; stl_p(&ressetpci->fh, pbdev->fh); @@ -818,7 +818,7 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar) ((uint32_t)pbdev->sum << 7) | pbdev->routes.adapter.summary_offset; stl_p(&fib.data, data); - if (pbdev->fh >> ENABLE_BIT_OFFSET) { + if (pbdev->fh & FH_ENABLED) { fib.fc |= 0x80; } -- 2.6.4