From: jonathan.derrick@intel.com (Jon Derrick)
Subject: [PATCH 1/5] nvme: remove the io_incapable method
Date: Tue, 26 Apr 2016 09:24:06 -0600 [thread overview]
Message-ID: <20160426152406.GA13040@localhost.localdomain> (raw)
In-Reply-To: <1461671520-4758-2-git-send-email-hch@lst.de>
Looks good
Acked-by: Jon Derrick <jonathan.derrick at intel.com>
On Tue, Apr 26, 2016@01:51:56PM +0200, Christoph Hellwig wrote:
> It's unused since "NVMe: Move error handling to failed reset handler".
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
> drivers/nvme/host/nvme.h | 12 ------------
> drivers/nvme/host/pci.c | 8 --------
> 2 files changed, 20 deletions(-)
>
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index 8e8fae8..c6b32c5 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -136,7 +136,6 @@ struct nvme_ctrl_ops {
> int (*reg_read32)(struct nvme_ctrl *ctrl, u32 off, u32 *val);
> int (*reg_write32)(struct nvme_ctrl *ctrl, u32 off, u32 val);
> int (*reg_read64)(struct nvme_ctrl *ctrl, u32 off, u64 *val);
> - bool (*io_incapable)(struct nvme_ctrl *ctrl);
> int (*reset_ctrl)(struct nvme_ctrl *ctrl);
> void (*free_ctrl)(struct nvme_ctrl *ctrl);
> };
> @@ -150,17 +149,6 @@ static inline bool nvme_ctrl_ready(struct nvme_ctrl *ctrl)
> return val & NVME_CSTS_RDY;
> }
>
> -static inline bool nvme_io_incapable(struct nvme_ctrl *ctrl)
> -{
> - u32 val = 0;
> -
> - if (ctrl->ops->io_incapable(ctrl))
> - return true;
> - if (ctrl->ops->reg_read32(ctrl, NVME_REG_CSTS, &val))
> - return true;
> - return val & NVME_CSTS_CFS;
> -}
> -
> static inline int nvme_reset_subsystem(struct nvme_ctrl *ctrl)
> {
> if (!ctrl->subsystem)
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index ff3c8d7..23998c7 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -1941,13 +1941,6 @@ static int nvme_pci_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val)
> return 0;
> }
>
> -static bool nvme_pci_io_incapable(struct nvme_ctrl *ctrl)
> -{
> - struct nvme_dev *dev = to_nvme_dev(ctrl);
> -
> - return !dev->bar || dev->online_queues < 2;
> -}
> -
> static int nvme_pci_reset_ctrl(struct nvme_ctrl *ctrl)
> {
> return nvme_reset(to_nvme_dev(ctrl));
> @@ -1958,7 +1951,6 @@ static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = {
> .reg_read32 = nvme_pci_reg_read32,
> .reg_write32 = nvme_pci_reg_write32,
> .reg_read64 = nvme_pci_reg_read64,
> - .io_incapable = nvme_pci_io_incapable,
> .reset_ctrl = nvme_pci_reset_ctrl,
> .free_ctrl = nvme_pci_free_ctrl,
> };
> --
> 2.1.4
>
>
> _______________________________________________
> Linux-nvme mailing list
> Linux-nvme at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2016-04-26 15:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 11:51 proper controller state machine and more common code V2 Christoph Hellwig
2016-04-26 11:51 ` [PATCH 1/5] nvme: remove the io_incapable method Christoph Hellwig
2016-04-26 15:24 ` Jon Derrick [this message]
2016-04-26 21:19 ` Sagi Grimberg
2016-04-26 11:51 ` [PATCH 2/5] nvme: introduce a controller state machine Christoph Hellwig
2016-04-26 16:18 ` Jon Derrick
2016-04-27 7:50 ` Christoph Hellwig
2016-04-26 11:51 ` [PATCH 3/5] nvme: tighten up state check for namespace scanning Christoph Hellwig
2016-04-26 16:40 ` Jon Derrick
2016-04-27 7:51 ` Christoph Hellwig
2016-04-26 11:51 ` [PATCH 4/5] nvme: move namespace scanning to core Christoph Hellwig
2016-04-26 17:16 ` Jon Derrick
2016-04-26 11:52 ` [PATCH 5/5] nvme: move AER handling to common code Christoph Hellwig
2016-05-02 15:10 ` proper controller state machine and more common code V2 Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2016-04-18 12:34 proper controller state machine and more common code Christoph Hellwig
2016-04-18 12:34 ` [PATCH 1/5] nvme: remove the io_incapable method 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=20160426152406.GA13040@localhost.localdomain \
--to=jonathan.derrick@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.