From: Baolin Wang <baolin.wang@linux.alibaba.com>
To: kbusch@kernel.org, axboe@fb.com, hch@lst.de, sagi@grimberg.me
Cc: baolin.wang7@gmail.com, linux-nvme@lists.infradead.org,
baolin.wang@linux.alibaba.com, 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 [thread overview]
Message-ID: <dbb9c52aeb4030387a17342ca9e76fd09d84a0ed.1593743937.git.baolin.wang@linux.alibaba.com> (raw)
In-Reply-To: <cover.1593743937.git.baolin.wang@linux.alibaba.com>
In-Reply-To: <cover.1593743937.git.baolin.wang@linux.alibaba.com>
Add a blank line after declarations to make code more readable.
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
---
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
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-07-03 2:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-03 2:49 [PATCH 0/5] Some cleanups for NVMe-pci driver Baolin Wang
2020-07-03 2:49 ` [PATCH 1/5] nvme-pci: Fix some comments issues Baolin Wang
2020-07-05 6:57 ` Sagi Grimberg
2020-07-06 2:10 ` Chaitanya Kulkarni
2020-07-03 2:49 ` Baolin Wang [this message]
2020-07-05 6:57 ` [PATCH 2/5] nvme-pci: Add a blank line after declarations Sagi Grimberg
2020-07-06 2:09 ` Chaitanya Kulkarni
2020-07-03 2:49 ` [PATCH 3/5] nvme-pci: Remove redundant segment validation Baolin Wang
2020-07-06 2:23 ` Chaitanya Kulkarni
2020-07-03 2:49 ` [PATCH 4/5] nvme-pci: Use the consistent return type of nvme_pci_iod_alloc_size() Baolin Wang
2020-07-05 6:59 ` Sagi Grimberg
2020-07-06 2:24 ` Chaitanya Kulkarni
2020-07-03 2:49 ` [PATCH 5/5] nvme-pci: Use standard block status macro Baolin Wang
2020-07-05 7:00 ` Sagi Grimberg
2020-07-06 2:25 ` Chaitanya Kulkarni
2020-07-07 19:01 ` Keith Busch
2020-07-08 1:25 ` Baolin Wang
2020-07-08 6:05 ` Christoph Hellwig
2020-07-07 8:50 ` [PATCH 0/5] Some cleanups for NVMe-pci driver Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dbb9c52aeb4030387a17342ca9e76fd09d84a0ed.1593743937.git.baolin.wang@linux.alibaba.com \
--to=baolin.wang@linux.alibaba.com \
--cc=axboe@fb.com \
--cc=baolin.wang7@gmail.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox