From patchwork Sat Mar 12 07:39:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Lin X-Patchwork-Id: 8571011 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 32606C0553 for ; Sat, 12 Mar 2016 07:48:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 59F172034C for ; Sat, 12 Mar 2016 07:48:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55DFB202E9 for ; Sat, 12 Mar 2016 07:48:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751413AbcCLHs2 (ORCPT ); Sat, 12 Mar 2016 02:48:28 -0500 Received: from lucky1.263xmail.com ([211.157.147.133]:60652 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028AbcCLHs2 (ORCPT ); Sat, 12 Mar 2016 02:48:28 -0500 Received: from shawn.lin?rock-chips.com (unknown [192.168.167.140]) by lucky1.263xmail.com (Postfix) with SMTP id DE66C52D1A; Sat, 12 Mar 2016 15:48:15 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id E93BB439; Sat, 12 Mar 2016 15:48:11 +0800 (CST) X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: arvindkumar@vmware.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: lintao@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 12379RDXWUS; Sat, 12 Mar 2016 15:48:12 +0800 (CST) From: Shawn Lin To: Arvind Kumar , VMware PV-Drivers , JBottomley@odin.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, Shawn Lin Subject: [PATCH] vmw_pscsi: reuse PAGE_ALIGNED to simplify the code Date: Sat, 12 Mar 2016 15:39:26 +0800 Message-Id: <1457768366-30362-1-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.8.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Aligned check with page size can be replaced with PAGE_ALIGNED to simplify the code. Signed-off-by: Shawn Lin --- drivers/scsi/vmw_pvscsi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index 6164634..0b0b0bd 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c @@ -458,9 +458,9 @@ static int pvscsi_allocate_rings(struct pvscsi_adapter *adapter) if (!adapter->cmp_ring) return -ENOMEM; - BUG_ON(!IS_ALIGNED(adapter->ringStatePA, PAGE_SIZE)); - BUG_ON(!IS_ALIGNED(adapter->reqRingPA, PAGE_SIZE)); - BUG_ON(!IS_ALIGNED(adapter->cmpRingPA, PAGE_SIZE)); + BUG_ON(!PAGE_ALIGNED(adapter->ringStatePA)); + BUG_ON(!PAGE_ALIGNED(adapter->reqRingPA)); + BUG_ON(!PAGE_ALIGNED(adapter->cmpRingPA)); if (!adapter->use_msg) return 0; @@ -472,7 +472,7 @@ static int pvscsi_allocate_rings(struct pvscsi_adapter *adapter) &adapter->msgRingPA); if (!adapter->msg_ring) return -ENOMEM; - BUG_ON(!IS_ALIGNED(adapter->msgRingPA, PAGE_SIZE)); + BUG_ON(!PAGE_ALIGNED(adapter->msgRingPA)); return 0; } @@ -1287,7 +1287,7 @@ static int pvscsi_allocate_sg(struct pvscsi_adapter *adapter) ctx->sgl = (void *)__get_free_pages(GFP_KERNEL, get_order(SGL_SIZE)); ctx->sglPA = 0; - BUG_ON(!IS_ALIGNED(((unsigned long)ctx->sgl), PAGE_SIZE)); + BUG_ON(!PAGE_ALIGNED(((unsigned long)ctx->sgl))); if (!ctx->sgl) { for (; i >= 0; --i, --ctx) { free_pages((unsigned long)ctx->sgl,