Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1972712ybt; Thu, 2 Jul 2020 19:52:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0bfelWJTgepH6AhO7foJgj4Csurtbh4BJydhAjWN+folvg5jW+59ba9Jq/6BPENWcllRd X-Received: by 2002:a17:906:b0d3:: with SMTP id bk19mr32265147ejb.167.1593744723270; Thu, 02 Jul 2020 19:52:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593744723; cv=none; d=google.com; s=arc-20160816; b=G92mjxBU6D8Dv4SQ0yVgHorvbvYo95zhk5xuaXFYNUV3h4/u/hliSRV1PciU1Vr3Z0 iTQCfH0cL0AsT7pDP5WiMukSEOoYxlZiR/GlCsWPghQoa1hOttaErvVRKN3lA1imkJV4 hK4aUM1iMW1au7/QJ9Ay6K+mWc+lGZ0L2Gn4BYV9vqQO6qEmzQ99zdfHfw9ULptTLvIA X/r7IO8UeJDqVyHoDuLy2ibtQJ9QxqhQP41kZhrkKoIFHyTd3iw8H3tsTK5wH+j1Gxwz wXAoAvIcw9ZMlK2YU04fveBfmjMl84z8nw/W6/2Me5djIQrvYwGDsAn+1p98bq1FkHvi F+WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from; bh=8GOqVYNq3z4eeVlh34bXXz+iryTj8h1qUTYTUexTJww=; b=vtXSvmYD/NqvaqGiiCgqlFbWM2na3N/u3C/YBHOQwR19E/V1RzNi+tkt2tC8ThAeSg HnDSJJW6lkdbZ0iGEv1+3p65gjiUZ0mzFPhbdKBV6L3y/xVmlqvoaiTrdaZwA+SDMhGH NNhp9fftbJOOqWrZLmXZ+uBf3OFv+mX2MNwn7Afq5r26dspF/6RFS9PwW+o6aNyctAGC BpgU1v611rwELeqj0uxAe3Xj2fghDWDJ3CeBJM7lFmWKjFXIuxkbav2ts+EUHJjDkc0s Ws9ZnZm+xco+h70y+O0u6JBGQkFmEOC0eCpzAl8o7zXFy1klvl0Ni+49vDRBZIeRq0jn t63Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ss20si6497207ejb.700.2020.07.02.19.51.39; Thu, 02 Jul 2020 19:52:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726336AbgGCCt6 (ORCPT + 99 others); Thu, 2 Jul 2020 22:49:58 -0400 Received: from out4436.biz.mail.alibaba.com ([47.88.44.36]:62876 "EHLO out4436.biz.mail.alibaba.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725937AbgGCCt4 (ORCPT ); Thu, 2 Jul 2020 22:49:56 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R141e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01f04427;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0U1XOWK8_1593744584; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0U1XOWK8_1593744584) by smtp.aliyun-inc.com(127.0.0.1); Fri, 03 Jul 2020 10:49:44 +0800 From: Baolin Wang To: kbusch@kernel.org, axboe@fb.com, hch@lst.de, sagi@grimberg.me Cc: baolin.wang@linux.alibaba.com, baolin.wang7@gmail.com, linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] nvme-pci: Add a blank line after declarations Date: Fri, 3 Jul 2020 10:49:21 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a blank line after declarations to make code more readable. Signed-off-by: Baolin Wang --- drivers/nvme/host/pci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index a3d0c86..d0e9bbf 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1019,6 +1019,7 @@ static irqreturn_t nvme_irq(int irq, void *data) static irqreturn_t nvme_irq_check(int irq, void *data) { struct nvme_queue *nvmeq = data; + if (nvme_cqe_pending(nvmeq)) return IRQ_WAKE_THREAD; return IRQ_NONE; @@ -1401,6 +1402,7 @@ static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues, if (q_size_aligned * nr_io_queues > dev->cmb_size) { u64 mem_per_q = div_u64(dev->cmb_size, nr_io_queues); + mem_per_q = round_down(mem_per_q, dev->ctrl.page_size); q_depth = div_u64(mem_per_q, entry_size); @@ -2875,6 +2877,7 @@ static void nvme_reset_done(struct pci_dev *pdev) static void nvme_shutdown(struct pci_dev *pdev) { struct nvme_dev *dev = pci_get_drvdata(pdev); + nvme_disable_prepare_reset(dev, true); } @@ -3005,6 +3008,7 @@ static int nvme_suspend(struct device *dev) static int nvme_simple_suspend(struct device *dev) { struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev)); + return nvme_disable_prepare_reset(ndev, true); } -- 1.8.3.1