From: Eric Curtin <ecurtin@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Keith Busch <kbusch@kernel.org>, Sagi Grimberg <sagi@grimberg.me>,
James Smart <james.smart@broadcom.com>,
Chaitanya Kulkarni <kch@nvidia.com>,
Hector Martin <marcan@marcan.st>,
Sven Peter <sven@svenpeter.dev>,
asahi@lists.linux.dev, linux-nvme@lists.infradead.org
Subject: Re: [PATCH 5/9] nvme-pci: remove nvme_pci_disable
Date: Tue, 6 Dec 2022 10:39:10 +0000 [thread overview]
Message-ID: <CAOgh=FxeOUAeyY1xZGoWO1OGRRK4Usdx_E_h_C3T22iw4Vut5Q@mail.gmail.com> (raw)
In-Reply-To: <20221129132208.4337-6-hch@lst.de>
On Tue, 29 Nov 2022 at 13:29, Christoph Hellwig <hch@lst.de> wrote:
>
> nvme_pci_disable has a single caller, fold it into that.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Curtin <ecurtin@redhat.com>
> ---
> drivers/nvme/host/pci.c | 18 +++++-------------
> 1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index c6a02210d22b46..c3d9b23699d3f3 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -2657,18 +2657,6 @@ static void nvme_dev_unmap(struct nvme_dev *dev)
> pci_release_mem_regions(to_pci_dev(dev->dev));
> }
>
> -static void nvme_pci_disable(struct nvme_dev *dev)
> -{
> - struct pci_dev *pdev = to_pci_dev(dev->dev);
> -
> - pci_free_irq_vectors(pdev);
> -
> - if (pci_is_enabled(pdev)) {
> - pci_disable_pcie_error_reporting(pdev);
> - pci_disable_device(pdev);
> - }
> -}
> -
> static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
> {
> bool dead = true, freeze = false;
> @@ -2708,7 +2696,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
> }
> nvme_suspend_io_queues(dev);
> nvme_suspend_queue(&dev->queues[0]);
> - nvme_pci_disable(dev);
> + pci_free_irq_vectors(pdev);
> + if (pci_is_enabled(pdev)) {
> + pci_disable_pcie_error_reporting(pdev);
> + pci_disable_device(pdev);
> + }
> nvme_reap_pending_cqes(dev);
>
> nvme_cancel_tagset(&dev->ctrl);
> --
> 2.30.2
>
>
next prev parent reply other threads:[~2022-12-06 10:39 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-29 13:21 remove path cleanups Christoph Hellwig
2022-11-29 13:22 ` [PATCH 1/9] nvme-apple: fix controller shutdown in apple_nvme_disable Christoph Hellwig
2022-11-29 15:41 ` Hector Martin
2023-01-10 17:47 ` Janne Grunau
2023-01-11 4:09 ` Hector Martin
2023-01-11 9:30 ` Linux kernel regression tracking (#adding)
2022-12-06 10:37 ` Eric Curtin
2022-12-06 12:15 ` Sagi Grimberg
2022-11-29 13:22 ` [PATCH 2/9] nvme: use nvme_wait_ready in nvme_shutdown_ctrl Christoph Hellwig
2022-11-29 15:57 ` Pankaj Raghav
2022-11-30 13:57 ` Christoph Hellwig
2022-11-30 14:27 ` Pankaj Raghav
2022-11-30 16:15 ` Keith Busch
2022-12-06 13:33 ` Christoph Hellwig
2022-11-29 13:22 ` [PATCH 3/9] nvme: merge nvme_shutdown_ctrl into nvme_disable_ctrl Christoph Hellwig
2022-11-29 15:44 ` Hector Martin
2022-12-06 12:18 ` Sagi Grimberg
2022-11-29 13:22 ` [PATCH 4/9] nvme-pci: remove nvme_disable_admin_queue Christoph Hellwig
2022-12-06 10:38 ` Eric Curtin
2022-12-06 12:18 ` Sagi Grimberg
2022-11-29 13:22 ` [PATCH 5/9] nvme-pci: remove nvme_pci_disable Christoph Hellwig
2022-12-06 10:39 ` Eric Curtin [this message]
2022-12-06 12:19 ` Sagi Grimberg
2022-11-29 13:22 ` [PATCH 6/9] nvme-pci: cleanup nvme_suspend_queue Christoph Hellwig
2022-12-06 12:20 ` Sagi Grimberg
2022-11-29 13:22 ` [PATCH 7/9] nvme-pci: rename nvme_disable_io_queues Christoph Hellwig
2022-12-06 12:21 ` Sagi Grimberg
2022-11-29 13:22 ` [PATCH 8/9] nvme-pci: return early on ctrl state mismatch in nvme_reset_work Christoph Hellwig
2022-12-06 11:26 ` Keith Busch
2022-12-06 13:38 ` Christoph Hellwig
2022-12-06 12:21 ` Sagi Grimberg
2022-11-29 13:22 ` [PATCH 9/9] nvme-pci: split out a nvme_pci_ctrl_is_dead helper Christoph Hellwig
2022-12-06 12:23 ` Sagi Grimberg
2022-12-06 8:18 ` remove path cleanups Christoph Hellwig
2022-12-06 11:26 ` Keith Busch
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='CAOgh=FxeOUAeyY1xZGoWO1OGRRK4Usdx_E_h_C3T22iw4Vut5Q@mail.gmail.com' \
--to=ecurtin@redhat.com \
--cc=asahi@lists.linux.dev \
--cc=hch@lst.de \
--cc=james.smart@broadcom.com \
--cc=kbusch@kernel.org \
--cc=kch@nvidia.com \
--cc=linux-nvme@lists.infradead.org \
--cc=marcan@marcan.st \
--cc=sagi@grimberg.me \
--cc=sven@svenpeter.dev \
/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;
as well as URLs for NNTP newsgroup(s).